Move CrosDBusService to chromeos

Create a new directory chromeos/dbus/services.
Move CrosDBusService, LivenessServiceProvider and ServiceProviderTestHelper to the new directory.

BUG=429354

Review URL: https://codereview.chromium.org/732963005

Cr-Commit-Position: refs/heads/master@{#304569}

19 files changed, 37 insertions, 33 deletions

diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
index f26b713..8758015 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -30,9 +30,7 @@
 #include "chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification.h"
 #include "chrome/browser/chromeos/boot_times_loader.h"
 #include "chrome/browser/chromeos/dbus/console_service_provider.h"
-#include "chrome/browser/chromeos/dbus/cros_dbus_service.h"
 #include "chrome/browser/chromeos/dbus/display_power_service_provider.h"
-#include "chrome/browser/chromeos/dbus/liveness_service_provider.h"
 #include "chrome/browser/chromeos/dbus/printer_service_provider.h"
 #include "chrome/browser/chromeos/dbus/proxy_resolution_service_provider.h"
 #include "chrome/browser/chromeos/dbus/screen_lock_service_provider.h"
@@ -97,6 +95,8 @@
 #include "chromeos/cryptohome/system_salt_getter.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/power_policy_controller.h"
+#include "chromeos/dbus/services/cros_dbus_service.h"
+#include "chromeos/dbus/services/liveness_service_provider.h"
 #include "chromeos/dbus/session_manager_client.h"
 #include "chromeos/disks/disk_mount_manager.h"
 #include "chromeos/ime/ime_keyboard.h"
diff --git a/chrome/browser/chromeos/dbus/console_service_provider.h b/chrome/browser/chromeos/dbus/console_service_provider.h
index 2df5fee..864161d 100644
--- a/chrome/browser/chromeos/dbus/console_service_provider.h
+++ b/chrome/browser/chromeos/dbus/console_service_provider.h
@@ -8,7 +8,7 @@
 #include <string>
 
 #include "base/memory/weak_ptr.h"
-#include "chrome/browser/chromeos/dbus/cros_dbus_service.h"
+#include "chromeos/dbus/services/cros_dbus_service.h"
 #include "dbus/exported_object.h"
 
 namespace chromeos {
diff --git a/chrome/browser/chromeos/dbus/display_power_service_provider.h b/chrome/browser/chromeos/dbus/display_power_service_provider.h
index 691fb29..f725284 100644
--- a/chrome/browser/chromeos/dbus/display_power_service_provider.h
+++ b/chrome/browser/chromeos/dbus/display_power_service_provider.h
@@ -11,7 +11,7 @@
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
-#include "chrome/browser/chromeos/dbus/cros_dbus_service.h"
+#include "chromeos/dbus/services/cros_dbus_service.h"
 #include "dbus/exported_object.h"
 
 namespace dbus {
diff --git a/chrome/browser/chromeos/dbus/printer_service_provider.h b/chrome/browser/chromeos/dbus/printer_service_provider.h
index 988a51d..3ab8971 100644
--- a/chrome/browser/chromeos/dbus/printer_service_provider.h
+++ b/chrome/browser/chromeos/dbus/printer_service_provider.h
@@ -8,7 +8,7 @@
 #include <string>
 
 #include "base/memory/weak_ptr.h"
-#include "chrome/browser/chromeos/dbus/cros_dbus_service.h"
+#include "chromeos/dbus/services/cros_dbus_service.h"
 #include "dbus/exported_object.h"
 
 namespace dbus {
diff --git a/chrome/browser/chromeos/dbus/printer_service_provider_unittest.cc b/chrome/browser/chromeos/dbus/printer_service_provider_unittest.cc
index ebf09e4..f7f7434 100644
--- a/chrome/browser/chromeos/dbus/printer_service_provider_unittest.cc
+++ b/chrome/browser/chromeos/dbus/printer_service_provider_unittest.cc
@@ -4,7 +4,7 @@
 
 #include "chrome/browser/chromeos/dbus/printer_service_provider.h"
 
-#include "chrome/browser/chromeos/dbus/service_provider_test_helper.h"
+#include "chromeos/dbus/services/service_provider_test_helper.h"
 #include "dbus/message.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
diff --git a/chrome/browser/chromeos/dbus/proxy_resolution_service_provider.h b/chrome/browser/chromeos/dbus/proxy_resolution_service_provider.h
index 3fea2ef..70d0c1f 100644
--- a/chrome/browser/chromeos/dbus/proxy_resolution_service_provider.h
+++ b/chrome/browser/chromeos/dbus/proxy_resolution_service_provider.h
@@ -13,7 +13,7 @@
 #include "base/memory/weak_ptr.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/platform_thread.h"
-#include "chrome/browser/chromeos/dbus/cros_dbus_service.h"
+#include "chromeos/dbus/services/cros_dbus_service.h"
 #include "dbus/exported_object.h"
 
 namespace dbus {
diff --git a/chrome/browser/chromeos/dbus/proxy_resolution_service_provider_unittest.cc b/chrome/browser/chromeos/dbus/proxy_resolution_service_provider_unittest.cc
index 08eb756..f01b433 100644
--- a/chrome/browser/chromeos/dbus/proxy_resolution_service_provider_unittest.cc
+++ b/chrome/browser/chromeos/dbus/proxy_resolution_service_provider_unittest.cc
@@ -15,7 +15,7 @@
 #include "chrome/browser/chromeos/dbus/proxy_resolution_service_provider.h"
 
 #include "base/bind.h"
-#include "chrome/browser/chromeos/dbus/service_provider_test_helper.h"
+#include "chromeos/dbus/services/service_provider_test_helper.h"
 #include "dbus/message.h"
 #include "dbus/mock_exported_object.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
diff --git a/chrome/browser/chromeos/dbus/screen_lock_service_provider.h b/chrome/browser/chromeos/dbus/screen_lock_service_provider.h
index 83a0658..68a619b 100644
--- a/chrome/browser/chromeos/dbus/screen_lock_service_provider.h
+++ b/chrome/browser/chromeos/dbus/screen_lock_service_provider.h
@@ -11,7 +11,7 @@
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
-#include "chrome/browser/chromeos/dbus/cros_dbus_service.h"
+#include "chromeos/dbus/services/cros_dbus_service.h"
 #include "dbus/exported_object.h"
 
 namespace dbus {
diff --git a/chrome/chrome_browser_chromeos.gypi b/chrome/chrome_browser_chromeos.gypi
index b2749ef..c1484cc 100644
--- a/chrome/chrome_browser_chromeos.gypi
+++ b/chrome/chrome_browser_chromeos.gypi
@@ -79,12 +79,8 @@
         'browser/chromeos/display/overscan_calibrator.h',
         'browser/chromeos/dbus/console_service_provider.cc',
         'browser/chromeos/dbus/console_service_provider.h',
-        'browser/chromeos/dbus/cros_dbus_service.cc',
-        'browser/chromeos/dbus/cros_dbus_service.h',
         'browser/chromeos/dbus/display_power_service_provider.cc',
         'browser/chromeos/dbus/display_power_service_provider.h',
-        'browser/chromeos/dbus/liveness_service_provider.cc',
-        'browser/chromeos/dbus/liveness_service_provider.h',
         'browser/chromeos/dbus/printer_service_provider.cc',
         'browser/chromeos/dbus/printer_service_provider.h',
         'browser/chromeos/dbus/proxy_resolution_service_provider.cc',
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index e0fa030..8408ab1 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -79,11 +79,8 @@
       'browser/chromeos/attestation/fake_certificate.h',
       'browser/chromeos/attestation/platform_verification_flow_unittest.cc',
       'browser/chromeos/customization_document_unittest.cc',
-      'browser/chromeos/dbus/cros_dbus_service_unittest.cc',
       'browser/chromeos/dbus/printer_service_provider_unittest.cc',
       'browser/chromeos/dbus/proxy_resolution_service_provider_unittest.cc',
-      'browser/chromeos/dbus/service_provider_test_helper.cc',
-      'browser/chromeos/dbus/service_provider_test_helper.h',
       'browser/chromeos/display/display_preferences_unittest.cc',
       'browser/chromeos/drive/change_list_loader_unittest.cc',
       'browser/chromeos/drive/change_list_processor_unittest.cc',
diff --git a/chromeos/BUILD.gn b/chromeos/BUILD.gn
index 6d677b2..33c47b1 100644
--- a/chromeos/BUILD.gn
+++ b/chromeos/BUILD.gn
@@ -87,6 +87,8 @@ static_library("test_support") {
     "dbus/mock_shill_profile_client.h",
     "dbus/mock_shill_service_client.cc",
     "dbus/mock_shill_service_client.h",
+    "dbus/services/service_provider_test_helper.cc",
+    "dbus/services/service_provider_test_helper.h",
     "disks/mock_disk_mount_manager.cc",
     "disks/mock_disk_mount_manager.h",
     "ime/mock_component_extension_ime_manager_delegate.cc",
diff --git a/chromeos/chromeos.gyp b/chromeos/chromeos.gyp
index ed5ebe6..6e3cb62 100644
--- a/chromeos/chromeos.gyp
+++ b/chromeos/chromeos.gyp
@@ -212,6 +212,10 @@
       'dbus/power_policy_controller.h',
       'dbus/privet_daemon_client.cc',
       'dbus/privet_daemon_client.h',
+      'dbus/services/cros_dbus_service.cc',
+      'dbus/services/cros_dbus_service.h',
+      'dbus/services/liveness_service_provider.cc',
+      'dbus/services/liveness_service_provider.h',
       'dbus/session_manager_client.cc',
       'dbus/session_manager_client.h',
       'dbus/shill_client_helper.cc',
@@ -428,6 +432,7 @@
       'dbus/modem_messaging_client_unittest.cc',
       'dbus/nfc_client_unittest.cc',
       'dbus/power_policy_controller_unittest.cc',
+      'dbus/services/cros_dbus_service_unittest.cc',
       'dbus/shill_client_unittest_base.cc',
       'dbus/shill_client_unittest_base.h',
       'dbus/shill_device_client_unittest.cc',
@@ -559,6 +564,8 @@
         'dbus/mock_shill_profile_client.h',
         'dbus/mock_shill_service_client.cc',
         'dbus/mock_shill_service_client.h',
+        'dbus/services/service_provider_test_helper.cc',
+        'dbus/services/service_provider_test_helper.h',
         'disks/mock_disk_mount_manager.cc',
         'disks/mock_disk_mount_manager.h',
         'ime/mock_component_extension_ime_manager_delegate.cc',
diff --git a/chrome/browser/chromeos/dbus/cros_dbus_service.cc b/chromeos/dbus/services/cros_dbus_service.cc
index 7f9598e..3e04416 100644
--- a/chrome/browser/chromeos/dbus/cros_dbus_service.cc
+++ b/chromeos/dbus/services/cros_dbus_service.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/dbus/cros_dbus_service.h"
+#include "chromeos/dbus/services/cros_dbus_service.h"
 
 #include "base/bind.h"
 #include "base/stl_util.h"
diff --git a/chrome/browser/chromeos/dbus/cros_dbus_service.h b/chromeos/dbus/services/cros_dbus_service.h
index d745af8..50d2297 100644
--- a/chrome/browser/chromeos/dbus/cros_dbus_service.h
+++ b/chromeos/dbus/services/cros_dbus_service.h
@@ -2,14 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_DBUS_CROS_DBUS_SERVICE_H_
-#define CHROME_BROWSER_CHROMEOS_DBUS_CROS_DBUS_SERVICE_H_
+#ifndef CHROMEOS_DBUS_SERVICES_CROS_DBUS_SERVICE_H_
+#define CHROMEOS_DBUS_SERVICES_CROS_DBUS_SERVICE_H_
 
 #include <vector>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_vector.h"
 #include "base/threading/platform_thread.h"
+#include "chromeos/chromeos_export.h"
 
 namespace dbus {
 class Bus;
@@ -30,7 +31,7 @@ namespace chromeos {
 // CrosDBusService exports D-Bus methods through service provider classes
 // that implement CrosDBusService::ServiceProviderInterface.
 
-class CrosDBusService {
+class CHROMEOS_EXPORT CrosDBusService {
  public:
   // CrosDBusService consists of service providers that implement this
   // interface.
@@ -64,4 +65,4 @@ class CrosDBusService {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_DBUS_CROS_DBUS_SERVICE_H_
+#endif  // CHROMEOS_DBUS_SERVICES_CROS_DBUS_SERVICE_H_
diff --git a/chrome/browser/chromeos/dbus/cros_dbus_service_unittest.cc b/chromeos/dbus/services/cros_dbus_service_unittest.cc
index 6aba129..fa4a0df 100644
--- a/chrome/browser/chromeos/dbus/cros_dbus_service_unittest.cc
+++ b/chromeos/dbus/services/cros_dbus_service_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/dbus/cros_dbus_service.h"
+#include "chromeos/dbus/services/cros_dbus_service.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
diff --git a/chrome/browser/chromeos/dbus/liveness_service_provider.cc b/chromeos/dbus/services/liveness_service_provider.cc
index fa53212..1648793 100644
--- a/chrome/browser/chromeos/dbus/liveness_service_provider.cc
+++ b/chromeos/dbus/services/liveness_service_provider.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/dbus/liveness_service_provider.h"
+#include "chromeos/dbus/services/liveness_service_provider.h"
 
 #include "base/bind.h"
 #include "dbus/bus.h"
diff --git a/chrome/browser/chromeos/dbus/liveness_service_provider.h b/chromeos/dbus/services/liveness_service_provider.h
index 8d0c87e..559d071 100644
--- a/chrome/browser/chromeos/dbus/liveness_service_provider.h
+++ b/chromeos/dbus/services/liveness_service_provider.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_DBUS_LIVENESS_SERVICE_PROVIDER_H_
-#define CHROME_BROWSER_CHROMEOS_DBUS_LIVENESS_SERVICE_PROVIDER_H_
+#ifndef CHROMEOS_DBUS_SERVICES_LIVENESS_SERVICE_PROVIDER_H_
+#define CHROMEOS_DBUS_SERVICES_LIVENESS_SERVICE_PROVIDER_H_
 
 #include <string>
 
@@ -11,7 +11,8 @@
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
-#include "chrome/browser/chromeos/dbus/cros_dbus_service.h"
+#include "chromeos/chromeos_export.h"
+#include "chromeos/dbus/services/cros_dbus_service.h"
 #include "dbus/exported_object.h"
 
 namespace dbus {
@@ -33,7 +34,7 @@ namespace chromeos {
 // -> method return sender=:1.9 -> dest=:1.27 reply_serial=2
 //
 // (An empty response should be returned.)
-class LivenessServiceProvider
+class CHROMEOS_EXPORT LivenessServiceProvider
     : public CrosDBusService::ServiceProviderInterface {
  public:
   LivenessServiceProvider();
@@ -63,4 +64,4 @@ class LivenessServiceProvider
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_DBUS_LIVENESS_SERVICE_PROVIDER_H_
+#endif  // CHROMEOS_DBUS_SERVICES_LIVENESS_SERVICE_PROVIDER_H_
diff --git a/chrome/browser/chromeos/dbus/service_provider_test_helper.cc b/chromeos/dbus/services/service_provider_test_helper.cc
index f28248c..b3030ac 100644
--- a/chrome/browser/chromeos/dbus/service_provider_test_helper.cc
+++ b/chromeos/dbus/services/service_provider_test_helper.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/dbus/service_provider_test_helper.h"
+#include "chromeos/dbus/services/service_provider_test_helper.h"
 
 #include "base/bind.h"
 #include "dbus/message.h"
diff --git a/chrome/browser/chromeos/dbus/service_provider_test_helper.h b/chromeos/dbus/services/service_provider_test_helper.h
index 04d2da0..196f6a6 100644
--- a/chrome/browser/chromeos/dbus/service_provider_test_helper.h
+++ b/chromeos/dbus/services/service_provider_test_helper.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_DBUS_SERVICE_PROVIDER_TEST_HELPER_H_
-#define CHROME_BROWSER_CHROMEOS_DBUS_SERVICE_PROVIDER_TEST_HELPER_H_
+#ifndef CHROMEOS_DBUS_SERVICES_SERVICE_PROVIDER_TEST_HELPER_H_
+#define CHROMEOS_DBUS_SERVICES_SERVICE_PROVIDER_TEST_HELPER_H_
 
 #include <string>
 
 #include "base/message_loop/message_loop.h"
-#include "chrome/browser/chromeos/dbus/cros_dbus_service.h"
+#include "chromeos/dbus/services/cros_dbus_service.h"
 #include "dbus/mock_exported_object.h"
 #include "dbus/mock_object_proxy.h"
 #include "dbus/object_proxy.h"
@@ -95,4 +95,4 @@ class ServiceProviderTestHelper {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_DBUS_SERVICE_PROVIDER_TEST_HELPER_H_
+#endif  // CHROMEOS_DBUS_SERVICES_SERVICE_PROVIDER_TEST_HELPER_H_