Canbus: Migrate to cyber file util. (#6748)

modules/canbus/tools/canbus_tester.cc

@@ -16,14 +16,14 @@
 
 #include <thread>
 
+#include "cyber/common/file.h"
+#include "cyber/common/log.h"
 #include "cyber/cyber.h"
 #include "cyber/time/rate.h"
 
-#include "cyber/common/log.h"
 #include "gflags/gflags.h"
 #include "modules/canbus/common/canbus_gflags.h"
 #include "modules/common/adapters/adapter_gflags.h"
-#include "modules/common/util/file.h"
 #include "modules/control/proto/control_cmd.pb.h"
 
 using apollo::control::ControlCommand;
@@ -44,8 +44,8 @@ int main(int32_t argc, char **argv) {
       node_->CreateWriter<ControlCommand>(FLAGS_control_command_topic);
 
   ControlCommand control_cmd;
-  if (!apollo::common::util::GetProtoFromFile(FLAGS_canbus_test_file,
-                                              &control_cmd)) {
+  if (!apollo::cyber::common::GetProtoFromFile(FLAGS_canbus_test_file,
+                                               &control_cmd)) {
     AERROR << "failed to load file: " << FLAGS_canbus_test_file;
     return -1;
   }

modules/canbus/vehicle/ge3/ge3_controller_test.cc

@@ -15,12 +15,14 @@
  *****************************************************************************/
 
 #include "modules/canbus/vehicle/ge3/ge3_controller.h"
+
 #include <string>
+
+#include "cyber/common/file.h"
 #include "gtest/gtest.h"
 #include "modules/canbus/proto/canbus_conf.pb.h"
 #include "modules/canbus/proto/chassis.pb.h"
 #include "modules/canbus/vehicle/ge3/ge3_message_manager.h"
-#include "modules/common/util/file.h"
 #include "modules/control/proto/control_cmd.pb.h"
 #include "modules/drivers/canbus/can_comm/can_sender.h"
 
@@ -36,7 +38,7 @@ class Ge3ControllerTest : public ::testing::Test {
   virtual void SetUp() {
     std::string canbus_conf_file =
         "modules/canbus/testdata/conf/ge3_canbus_conf_test.pb.txt";
-    ::apollo::common::util::GetProtoFromFile(canbus_conf_file, &canbus_conf_);
+    cyber::common::GetProtoFromFile(canbus_conf_file, &canbus_conf_);
     params_ = canbus_conf_.vehicle_parameter();
   }
 

modules/canbus/vehicle/gem/gem_controller_test.cc

@@ -18,12 +18,12 @@
 
 #include <string>
 
+#include "cyber/common/file.h"
 #include "gtest/gtest.h"
 
 #include "modules/canbus/proto/canbus_conf.pb.h"
 #include "modules/canbus/proto/chassis.pb.h"
 #include "modules/canbus/vehicle/gem/gem_message_manager.h"
-#include "modules/common/util/file.h"
 #include "modules/control/proto/control_cmd.pb.h"
 #include "modules/drivers/canbus/can_comm/can_sender.h"
 
@@ -39,7 +39,7 @@ class GemControllerTest : public ::testing::Test {
   virtual void SetUp() {
     std::string canbus_conf_file =
         "/apollo/modules/canbus/testdata/conf/gem_canbus_conf_test.pb.txt";
-    ::apollo::common::util::GetProtoFromFile(canbus_conf_file, &canbus_conf_);
+    cyber::common::GetProtoFromFile(canbus_conf_file, &canbus_conf_);
     params_ = canbus_conf_.vehicle_parameter();
   }
 

modules/canbus/vehicle/lincoln/lincoln_controller_test.cc

@@ -16,6 +16,7 @@
 
 #include "modules/canbus/vehicle/lincoln/lincoln_controller.h"
 
+#include "cyber/common/file.h"
 #include "gtest/gtest.h"
 
 #include "modules/canbus/proto/canbus_conf.pb.h"
@@ -23,7 +24,6 @@
 #include "modules/canbus/proto/chassis_detail.pb.h"
 #include "modules/canbus/vehicle/lincoln/lincoln_message_manager.h"
 #include "modules/common/proto/vehicle_signal.pb.h"
-#include "modules/common/util/file.h"
 #include "modules/control/proto/control_cmd.pb.h"
 #include "modules/drivers/canbus/can_comm/can_sender.h"
 
@@ -40,7 +40,7 @@ class LincolnControllerTest : public ::testing::Test {
   virtual void SetUp() {
     std::string canbus_conf_file =
         "/apollo/modules/canbus/testdata/conf/mkz_canbus_conf_test.pb.txt";
-    common::util::GetProtoFromFile(canbus_conf_file, &canbus_conf_);
+    cyber::common::GetProtoFromFile(canbus_conf_file, &canbus_conf_);
     params_ = canbus_conf_.vehicle_parameter();
     control_cmd_.set_throttle(20.0);
     control_cmd_.set_brake(0.0);

modules/canbus/vehicle/transit/transit_controller_test.cc

@@ -18,12 +18,12 @@
 
 #include <string>
 
+#include "cyber/common/file.h"
 #include "gtest/gtest.h"
 
 #include "modules/canbus/proto/canbus_conf.pb.h"
 #include "modules/canbus/proto/chassis.pb.h"
 #include "modules/canbus/vehicle/transit/transit_message_manager.h"
-#include "modules/common/util/file.h"
 #include "modules/control/proto/control_cmd.pb.h"
 #include "modules/drivers/canbus/can_comm/can_sender.h"
 
@@ -39,7 +39,7 @@ class TransitControllerTest : public ::testing::Test {
   virtual void SetUp() {
     std::string canbus_conf_file =
         "/apollo/modules/canbus/testdata/conf/transit_canbus_conf_test.pb.txt";
-    ::apollo::common::util::GetProtoFromFile(canbus_conf_file, &canbus_conf_);
+    cyber::common::GetProtoFromFile(canbus_conf_file, &canbus_conf_);
     params_ = canbus_conf_.vehicle_parameter();
   }
 

modules/canbus/vehicle/wey/wey_controller_test.cc

@@ -15,12 +15,15 @@
  *****************************************************************************/
 
 #include "modules/canbus/vehicle/wey/wey_controller.h"
+
 #include <string>
+
+#include "cyber/common/file.h"
 #include "gtest/gtest.h"
+
 #include "modules/canbus/proto/canbus_conf.pb.h"
 #include "modules/canbus/proto/chassis.pb.h"
 #include "modules/canbus/vehicle/wey/wey_message_manager.h"
-#include "modules/common/util/file.h"
 #include "modules/control/proto/control_cmd.pb.h"
 #include "modules/drivers/canbus/can_comm/can_sender.h"
 
@@ -36,7 +39,7 @@ class WeyControllerTest : public ::testing::Test {
   virtual void SetUp() {
     std::string canbus_conf_file =
         "modules/canbus/testdata/conf/wey_canbus_conf_test.pb.txt";
-    ::apollo::common::util::GetProtoFromFile(canbus_conf_file, &canbus_conf_);
+    cyber::common::GetProtoFromFile(canbus_conf_file, &canbus_conf_);
     params_ = canbus_conf_.vehicle_parameter();
   }