Move files inside chrome/browser/chromeos/dbus to chromeos/dbus

Move files in chrome/browser/chromeos/dbus/ to chromeos/dbus Add chromeos/dbus/DEPS Add chromeos.gyp:chromeos_test_support and chromeos.gyp:chromeos_unittests Add CHROMEOS_EXPORT to classes Move power related proto targets to chromeos.gyp Rewrite and sort #includes BUG=119583 TEST=component chromeos build success, checkdeps success Review URL: https://chromiumcodereview.appspot.com/9838085 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131065 0039d316-1c4b-4281-b951-d872f2087c98
author: hashimoto@chromium.org <hashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> 2012-04-06 01:54:36 +0000
committer: hashimoto@chromium.org <hashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> 2012-04-06 01:54:36 +0000
commit: 64e199254481d6132c3a7ccdf9b3a743bff86a88 (patch)
tree: c10cdf03cbde8439d1d8a7070a6c7f9fdf10f517
parent: 81a476c9ce1088345db02cf1647399d0e673d487 (diff)
download: chromium_src-64e199254481d6132c3a7ccdf9b3a743bff86a88.zip
chromium_src-64e199254481d6132c3a7ccdf9b3a743bff86a88.tar.gz
chromium_src-64e199254481d6132c3a7ccdf9b3a743bff86a88.tar.bz2
180 files changed, 657 insertions, 611 deletions
diff --git a/build/all.gyp b/build/all.gyp
index 48a1500..ee51f10 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -598,6 +598,11 @@
                 '../ui/views/views.gyp:views_unittests',
               ],
             }],
+            ['chromeos==1', {
+              'dependencies': [
+                '../chromeos/chromeos.gyp:chromeos_unittests',
+              ],
+            }],
           ],
         },
       ],  # targets
diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc
index e2e41c1..34a799a 100644
--- a/chrome/browser/automation/testing_automation_provider.cc
+++ b/chrome/browser/automation/testing_automation_provider.cc
@@ -154,7 +154,7 @@
 #endif
 
 #if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
 #endif
 
 #if defined(OS_MACOSX)
diff --git a/chrome/browser/automation/testing_automation_provider_chromeos.cc b/chrome/browser/automation/testing_automation_provider_chromeos.cc
index e4f1f49..6056e59 100644
--- a/chrome/browser/automation/testing_automation_provider_chromeos.cc
+++ b/chrome/browser/automation/testing_automation_provider_chromeos.cc
@@ -16,9 +16,6 @@
 #include "chrome/browser/chromeos/audio/audio_handler.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
-#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
-#include "chrome/browser/chromeos/dbus/power_manager_client.h"
-#include "chrome/browser/chromeos/dbus/update_engine_client.h"
 #include "chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen.h"
 #include "chrome/browser/chromeos/login/existing_user_controller.h"
 #include "chrome/browser/chromeos/login/login_display.h"
@@ -41,6 +38,9 @@
 #include "chrome/browser/ui/views/window.h"
 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
 #include "chrome/common/pref_names.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
+#include "chromeos/dbus/power_manager_client.h"
+#include "chromeos/dbus/update_engine_client.h"
 #include "net/base/network_change_notifier.h"
 #include "policy/policy_constants.h"
 #include "ui/views/widget/widget.h"
diff --git a/chrome/browser/chromeos/bluetooth/bluetooth_adapter.cc b/chrome/browser/chromeos/bluetooth/bluetooth_adapter.cc
index d11636b..2ffd17f 100644
--- a/chrome/browser/chromeos/bluetooth/bluetooth_adapter.cc
+++ b/chrome/browser/chromeos/bluetooth/bluetooth_adapter.cc
@@ -9,10 +9,10 @@
 #include "base/stl_util.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/bluetooth/bluetooth_device.h"
-#include "chrome/browser/chromeos/dbus/bluetooth_adapter_client.h"
-#include "chrome/browser/chromeos/dbus/bluetooth_device_client.h"
-#include "chrome/browser/chromeos/dbus/bluetooth_manager_client.h"
-#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
+#include "chromeos/dbus/bluetooth_adapter_client.h"
+#include "chromeos/dbus/bluetooth_device_client.h"
+#include "chromeos/dbus/bluetooth_manager_client.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
 #include "dbus/object_path.h"
 
 namespace chromeos {
diff --git a/chrome/browser/chromeos/bluetooth/bluetooth_adapter.h b/chrome/browser/chromeos/bluetooth/bluetooth_adapter.h
index 5a89a87..9a275ec 100644
--- a/chrome/browser/chromeos/bluetooth/bluetooth_adapter.h
+++ b/chrome/browser/chromeos/bluetooth/bluetooth_adapter.h
@@ -13,9 +13,9 @@
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/observer_list.h"
-#include "chrome/browser/chromeos/dbus/bluetooth_adapter_client.h"
-#include "chrome/browser/chromeos/dbus/bluetooth_device_client.h"
-#include "chrome/browser/chromeos/dbus/bluetooth_manager_client.h"
+#include "chromeos/dbus/bluetooth_adapter_client.h"
+#include "chromeos/dbus/bluetooth_device_client.h"
+#include "chromeos/dbus/bluetooth_manager_client.h"
 #include "dbus/object_path.h"
 
 namespace chromeos {
diff --git a/chrome/browser/chromeos/bluetooth/bluetooth_device.cc b/chrome/browser/chromeos/bluetooth/bluetooth_device.cc
index d5c7a70..6901be6 100644
--- a/chrome/browser/chromeos/bluetooth/bluetooth_device.cc
+++ b/chrome/browser/chromeos/bluetooth/bluetooth_device.cc
@@ -14,13 +14,13 @@
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/bluetooth/bluetooth_adapter.h"
-#include "chrome/browser/chromeos/dbus/bluetooth_adapter_client.h"
-#include "chrome/browser/chromeos/dbus/bluetooth_agent_service_provider.h"
-#include "chrome/browser/chromeos/dbus/bluetooth_device_client.h"
-#include "chrome/browser/chromeos/dbus/bluetooth_input_client.h"
-#include "chrome/browser/chromeos/dbus/introspectable_client.h"
 #include "chrome/browser/chromeos/dbus/introspect_util.h"
-#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
+#include "chromeos/dbus/bluetooth_adapter_client.h"
+#include "chromeos/dbus/bluetooth_agent_service_provider.h"
+#include "chromeos/dbus/bluetooth_device_client.h"
+#include "chromeos/dbus/bluetooth_input_client.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
+#include "chromeos/dbus/introspectable_client.h"
 #include "dbus/bus.h"
 #include "dbus/object_path.h"
 #include "grit/generated_resources.h"
diff --git a/chrome/browser/chromeos/bluetooth/bluetooth_device.h b/chrome/browser/chromeos/bluetooth/bluetooth_device.h
index 97203fa..da37bd2 100644
--- a/chrome/browser/chromeos/bluetooth/bluetooth_device.h
+++ b/chrome/browser/chromeos/bluetooth/bluetooth_device.h
@@ -13,8 +13,8 @@
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
-#include "chrome/browser/chromeos/dbus/bluetooth_agent_service_provider.h"
-#include "chrome/browser/chromeos/dbus/bluetooth_device_client.h"
+#include "chromeos/dbus/bluetooth_agent_service_provider.h"
+#include "chromeos/dbus/bluetooth_device_client.h"
 #include "dbus/object_path.h"
 
 namespace chromeos {
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
index d3bf0e8..b7aa692 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -12,15 +12,12 @@
 #include "base/message_loop.h"
 #include "base/string_number_conversions.h"
 #include "chrome/browser/browser_process_impl.h"
-#include "chrome/browser/chromeos/background/desktop_background_observer.h"
 #include "chrome/browser/chromeos/audio/audio_handler.h"
+#include "chrome/browser/chromeos/background/desktop_background_observer.h"
 #include "chrome/browser/chromeos/boot_times_loader.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cryptohome/async_method_caller.h"
 #include "chrome/browser/chromeos/dbus/cros_dbus_service.h"
-#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
-#include "chrome/browser/chromeos/dbus/power_manager_client.h"
-#include "chrome/browser/chromeos/dbus/session_manager_client.h"
 #include "chrome/browser/chromeos/disks/disk_mount_manager.h"
 #include "chrome/browser/chromeos/external_metrics.h"
 #include "chrome/browser/chromeos/imageburner/burn_manager.h"
@@ -64,6 +61,9 @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/logging_chrome.h"
 #include "chrome/common/pref_names.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
+#include "chromeos/dbus/power_manager_client.h"
+#include "chromeos/dbus/session_manager_client.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/common/main_function_params.h"
 #include "grit/platform_locale_settings.h"
diff --git a/chrome/browser/chromeos/cros/burn_library.cc b/chrome/browser/chromeos/cros/burn_library.cc
index 6bb33e5..aaebe1f 100644
--- a/chrome/browser/chromeos/cros/burn_library.cc
+++ b/chrome/browser/chromeos/cros/burn_library.cc
@@ -9,10 +9,10 @@
 #include "base/memory/ref_counted_memory.h"
 #include "base/observer_list.h"
 #include "base/threading/worker_pool.h"
-#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
-#include "chrome/browser/chromeos/dbus/image_burner_client.h"
 #include "chrome/browser/chromeos/disks/disk_mount_manager.h"
 #include "chrome/common/zip.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
+#include "chromeos/dbus/image_burner_client.h"
 
 namespace chromeos {
 
diff --git a/chrome/browser/chromeos/cros/cert_library.cc b/chrome/browser/chromeos/cros/cert_library.cc
index 713b0f2..ac1e0a8 100644
--- a/chrome/browser/chromeos/cros/cert_library.cc
+++ b/chrome/browser/chromeos/cros/cert_library.cc
@@ -14,10 +14,10 @@
 #include "chrome/browser/browser_process.h"  // g_browser_process
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/cryptohome_library.h"
-#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
-#include "chrome/browser/chromeos/dbus/cryptohome_client.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/common/net/x509_certificate_model.h"
+#include "chromeos/dbus/cryptohome_client.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "crypto/encryptor.h"
 #include "crypto/nss_util.h"
diff --git a/chrome/browser/chromeos/cros/cryptohome_library.cc b/chrome/browser/chromeos/cros/cryptohome_library.cc
index 59511ca..075e057 100644
--- a/chrome/browser/chromeos/cros/cryptohome_library.cc
+++ b/chrome/browser/chromeos/cros/cryptohome_library.cc
@@ -8,9 +8,9 @@
 #include "base/message_loop.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
-#include "chrome/browser/chromeos/dbus/cryptohome_client.h"
-#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
 #include "chrome/common/chrome_switches.h"
+#include "chromeos/dbus/cryptohome_client.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "crypto/encryptor.h"
 #include "crypto/sha2.h"
diff --git a/chrome/browser/chromeos/cros/onc_network_parser_unittest.cc b/chrome/browser/chromeos/cros/onc_network_parser_unittest.cc
index 9f0f5d4..d81a2b2 100644
--- a/chrome/browser/chromeos/cros/onc_network_parser_unittest.cc
+++ b/chrome/browser/chromeos/cros/onc_network_parser_unittest.cc
@@ -19,13 +19,13 @@
 #include "chrome/browser/chromeos/cros/certificate_pattern.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
-#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
 #include "chrome/browser/chromeos/login/mock_user_manager.h"
 #include "chrome/browser/net/pref_proxy_config_tracker_impl.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/net/x509_certificate_model.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_pref_service.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
 #include "content/test/test_browser_thread.h"
 #include "crypto/nss_util.h"
 #include "net/base/cert_database.h"
diff --git a/chrome/browser/chromeos/cryptohome/async_method_caller.cc b/chrome/browser/chromeos/cryptohome/async_method_caller.cc
index d3ea3f3..85f1706 100644
--- a/chrome/browser/chromeos/cryptohome/async_method_caller.cc
+++ b/chrome/browser/chromeos/cryptohome/async_method_caller.cc
@@ -8,8 +8,8 @@
 #include "base/hash_tables.h"
 #include "base/location.h"
 #include "base/message_loop_proxy.h"
-#include "chrome/browser/chromeos/dbus/cryptohome_client.h"
-#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
+#include "chromeos/dbus/cryptohome_client.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
 
 using chromeos::DBusThreadManager;
 
diff --git a/chrome/browser/chromeos/dbus/cros_dbus_service.cc b/chrome/browser/chromeos/dbus/cros_dbus_service.cc
index 1dbc96f..7f821e3 100644
--- a/chrome/browser/chromeos/dbus/cros_dbus_service.cc
+++ b/chrome/browser/chromeos/dbus/cros_dbus_service.cc
@@ -8,8 +8,8 @@
 #include "base/chromeos/chromeos_version.h"
 #include "base/stl_util.h"
 #include "base/threading/platform_thread.h"
-#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
 #include "chrome/browser/chromeos/dbus/proxy_resolution_service_provider.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
 #include "dbus/bus.h"
 #include "dbus/exported_object.h"
 #include "dbus/object_path.h"
diff --git a/chrome/browser/chromeos/dbus/proxy_resolution_service_provider.h b/chrome/browser/chromeos/dbus/proxy_resolution_service_provider.h
index 383c082..36a6196 100644
--- a/chrome/browser/chromeos/dbus/proxy_resolution_service_provider.h
+++ b/chrome/browser/chromeos/dbus/proxy_resolution_service_provider.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
diff --git a/chrome/browser/chromeos/disks/disk_mount_manager.cc b/chrome/browser/chromeos/disks/disk_mount_manager.cc
index 837a9b5..38fbf02 100644
--- a/chrome/browser/chromeos/disks/disk_mount_manager.cc
+++ b/chrome/browser/chromeos/disks/disk_mount_manager.cc
@@ -13,7 +13,7 @@
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/string_util.h"
-#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
diff --git a/chrome/browser/chromeos/disks/disk_mount_manager.h b/chrome/browser/chromeos/disks/disk_mount_manager.h
index 6ecb2b7..af8406f 100644
--- a/chrome/browser/chromeos/disks/disk_mount_manager.h
+++ b/chrome/browser/chromeos/disks/disk_mount_manager.h
@@ -8,7 +8,7 @@
 
 #include <map>
 
-#include "chrome/browser/chromeos/dbus/cros_disks_client.h"
+#include "chromeos/dbus/cros_disks_client.h"
 
 namespace chromeos {
 namespace disks {
diff --git a/chrome/browser/chromeos/enterprise_extension_observer.cc b/chrome/browser/chromeos/enterprise_extension_observer.cc
index 57342dc..c8e61ef 100644
--- a/chrome/browser/chromeos/enterprise_extension_observer.cc
+++ b/chrome/browser/chromeos/enterprise_extension_observer.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -7,10 +7,10 @@
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
-#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
-#include "chrome/browser/chromeos/dbus/session_manager_client.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_notification_types.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
+#include "chromeos/dbus/session_manager_client.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
diff --git a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.cc b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.cc
index a1c2b23..a12dd38 100644
--- a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.cc
+++ b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.cc
@@ -8,12 +8,12 @@
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
-#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
-#include "chrome/browser/chromeos/dbus/power_manager_client.h"
 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/ui/idle_logout_dialog_view.h"
 #include "chrome/common/chrome_notification_types.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
+#include "chromeos/dbus/power_manager_client.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
diff --git a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.h b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.h
index 109dba1..abf20af 100644
--- a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.h
+++ b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include "base/basictypes.h"
-#include "chrome/browser/chromeos/dbus/power_manager_client.h"
+#include "chromeos/dbus/power_manager_client.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
diff --git a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout_unittest.cc b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout_unittest.cc
index 1af58ee..79e1829 100644
--- a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout_unittest.cc
+++ b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout_unittest.cc
@@ -8,9 +8,9 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/synchronization/waitable_event.h"
-#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/common/chrome_notification_types.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
diff --git a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc
index 38a3d5c..9bdfb33 100644
--- a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc
+++ b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc
@@ -8,7 +8,6 @@
 #include "base/callback.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
-#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
 #include "chrome/browser/chromeos/login/existing_user_controller.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
@@ -17,6 +16,7 @@
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_file_util.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 
diff --git a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h
index 0ba655e..db72f45 100644
--- a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h
+++ b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h
@@ -9,7 +9,7 @@
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/memory/weak_ptr.h"
-#include "chrome/browser/chromeos/dbus/power_manager_client.h"
+#include "chromeos/dbus/power_manager_client.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
diff --git a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver_unittest.cc b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver_unittest.cc
index 08ec40a6..3ad8113 100644
--- a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver_unittest.cc
+++ b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver_unittest.cc
@@ -8,11 +8,11 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/synchronization/waitable_event.h"
-#include "chrome/browser/chromeos/dbus/mock_dbus_thread_manager.h"
-#include "chrome/browser/chromeos/dbus/mock_power_manager_client.h"
 #include "chrome/browser/chromeos/login/mock_user_manager.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
+#include "chromeos/dbus/mock_dbus_thread_manager.h"
+#include "chromeos/dbus/mock_power_manager_client.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
diff --git a/chrome/browser/chromeos/login/base_login_display_host.cc b/chrome/browser/chromeos/login/base_login_display_host.cc
index 61ef179..893bcaf 100644
--- a/chrome/browser/chromeos/login/base_login_display_host.cc
+++ b/chrome/browser/chromeos/login/base_login_display_host.cc
@@ -14,8 +14,6 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
-#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
-#include "chrome/browser/chromeos/dbus/session_manager_client.h"
 #include "chrome/browser/chromeos/customization_document.h"
 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
@@ -35,6 +33,8 @@
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
+#include "chromeos/dbus/session_manager_client.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "googleurl/src/gurl.h"
diff --git a/chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen.cc b/chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen.cc
index a7d2e8b..f87451d 100644
--- a/chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen.cc
+++ b/chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen.cc
@@ -11,14 +11,14 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/cryptohome_library.h"
-#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
-#include "chrome/browser/chromeos/dbus/session_manager_client.h"
 #include "chrome/browser/chromeos/login/authenticator.h"
 #include "chrome/browser/chromeos/login/screen_observer.h"
 #include "chrome/browser/policy/auto_enrollment_client.h"
 #include "chrome/browser/policy/browser_policy_connector.h"
 #include "chrome/browser/policy/cloud_policy_data_store.h"
 #include "chrome/browser/policy/enterprise_metrics.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
+#include "chromeos/dbus/session_manager_client.h"
 
 namespace chromeos {
 
diff --git a/chrome/browser/chromeos/login/existing_user_controller.cc b/chrome/browser/chromeos/login/existing_user_controller.cc
index 1e3bbfd..49fd7b0 100644
--- a/chrome/browser/chromeos/login/existing_user_controller.cc
+++ b/chrome/browser/chromeos/login/existing_user_controller.cc
@@ -23,8 +23,6 @@
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/cros_settings.h"
 #include "chrome/browser/chromeos/customization_document.h"
-#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
-#include "chrome/browser/chromeos/dbus/session_manager_client.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/login/login_display_host.h"
 #include "chrome/browser/chromeos/login/login_utils.h"
@@ -42,6 +40,8 @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/net/gaia/google_service_auth_error.h"
 #include "chrome/common/pref_names.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
+#include "chromeos/dbus/session_manager_client.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
diff --git a/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc b/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc
index 784df4c..3dcd077 100644
--- a/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc
+++ b/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc
@@ -10,8 +10,6 @@
 #include "chrome/browser/chromeos/cros/cros_mock.h"
 #include "chrome/browser/chromeos/cros/mock_cryptohome_library.h"
 #include "chrome/browser/chromeos/cros/mock_network_library.h"
-#include "chrome/browser/chromeos/dbus/mock_dbus_thread_manager.h"
-#include "chrome/browser/chromeos/dbus/mock_session_manager_client.h"
 #include "chrome/browser/chromeos/login/existing_user_controller.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/login/login_display.h"
@@ -27,6 +25,8 @@
 #include "chrome/common/net/gaia/mock_url_fetcher_factory.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/test/base/ui_test_utils.h"
+#include "chromeos/dbus/mock_dbus_thread_manager.h"
+#include "chromeos/dbus/mock_session_manager_client.h"
 #include "grit/generated_resources.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/chromeos/login/login_performer.cc b/chrome/browser/chromeos/login/login_performer.cc
index d348c18..a2b5d16 100644
--- a/chrome/browser/chromeos/login/login_performer.cc
+++ b/chrome/browser/chromeos/login/login_performer.cc
@@ -17,8 +17,6 @@
 #include "chrome/browser/chromeos/boot_times_loader.h"
 #include "chrome/browser/chromeos/cros_settings.h"
 #include "chrome/browser/chromeos/cros_settings_names.h"
-#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
-#include "chrome/browser/chromeos/dbus/power_manager_client.h"
 #include "chrome/browser/chromeos/login/login_utils.h"
 #include "chrome/browser/chromeos/login/screen_locker.h"
 #include "chrome/browser/prefs/pref_service.h"
@@ -27,6 +25,8 @@
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
+#include "chromeos/dbus/power_manager_client.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
diff --git a/chrome/browser/chromeos/login/login_utils.cc b/chrome/browser/chromeos/login/login_utils.cc
index 83de47a..4d18886 100644
--- a/chrome/browser/chromeos/login/login_utils.cc
+++ b/chrome/browser/chromeos/login/login_utils.cc
@@ -31,8 +31,6 @@
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/cros_settings.h"
 #include "chrome/browser/chromeos/cros_settings_names.h"
-#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
-#include "chrome/browser/chromeos/dbus/session_manager_client.h"
 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
 #include "chrome/browser/chromeos/login/language_switch_menu.h"
@@ -69,6 +67,8 @@
 #include "chrome/common/net/gaia/gaia_urls.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
+#include "chromeos/dbus/session_manager_client.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "googleurl/src/gurl.h"
diff --git a/chrome/browser/chromeos/login/login_utils_browsertest.cc b/chrome/browser/chromeos/login/login_utils_browsertest.cc
index e471404..4137ce4 100644
--- a/chrome/browser/chromeos/login/login_utils_browsertest.cc
+++ b/chrome/browser/chromeos/login/login_utils_browsertest.cc
@@ -14,8 +14,6 @@
 #include "chrome/browser/chromeos/cros/mock_cryptohome_library.h"
 #include "chrome/browser/chromeos/cros/mock_library_loader.h"
 #include "chrome/browser/chromeos/cryptohome/mock_async_method_caller.h"
-#include "chrome/browser/chromeos/dbus/mock_dbus_thread_manager.h"
-#include "chrome/browser/chromeos/dbus/mock_session_manager_client.h"
 #include "chrome/browser/chromeos/login/authenticator.h"
 #include "chrome/browser/chromeos/login/login_status_consumer.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
@@ -32,6 +30,8 @@
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_pref_service.h"
+#include "chromeos/dbus/mock_dbus_thread_manager.h"
+#include "chromeos/dbus/mock_session_manager_client.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/url_fetcher_delegate.h"
 #include "content/test/test_browser_thread.h"
diff --git a/chrome/browser/chromeos/login/network_screen_browsertest.cc b/chrome/browser/chromeos/login/network_screen_browsertest.cc
index 37b68c2..a00e252 100644
--- a/chrome/browser/chromeos/login/network_screen_browsertest.cc
+++ b/chrome/browser/chromeos/login/network_screen_browsertest.cc
@@ -12,8 +12,6 @@
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/mock_network_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
-#include "chrome/browser/chromeos/dbus/mock_dbus_thread_manager.h"
-#include "chrome/browser/chromeos/dbus/mock_session_manager_client.h"
 #include "chrome/browser/chromeos/login/mock_screen_observer.h"
 #include "chrome/browser/chromeos/login/network_screen.h"
 #include "chrome/browser/chromeos/login/view_screen.h"
@@ -21,6 +19,8 @@
 #include "chrome/browser/chromeos/login/wizard_in_process_browser_test.h"
 #include "chrome/browser/chromeos/login/wizard_screen.h"
 #include "chrome/test/base/ui_test_utils.h"
+#include "chromeos/dbus/mock_dbus_thread_manager.h"
+#include "chromeos/dbus/mock_session_manager_client.h"
 #include "grit/generated_resources.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/chromeos/login/parallel_authenticator.cc b/chrome/browser/chromeos/login/parallel_authenticator.cc
index 90492e4..a89be45 100644
--- a/chrome/browser/chromeos/login/parallel_authenticator.cc
+++ b/chrome/browser/chromeos/login/parallel_authenticator.cc
@@ -16,8 +16,6 @@
 #include "chrome/browser/chromeos/cros/cryptohome_library.h"
 #include "chrome/browser/chromeos/cros_settings.h"
 #include "chrome/browser/chromeos/cryptohome/async_method_caller.h"
-#include "chrome/browser/chromeos/dbus/cryptohome_client.h"
-#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
 #include "chrome/browser/chromeos/login/authentication_notification_details.h"
 #include "chrome/browser/chromeos/login/login_status_consumer.h"
 #include "chrome/browser/chromeos/login/ownership_service.h"
@@ -25,6 +23,8 @@
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
+#include "chromeos/dbus/cryptohome_client.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
diff --git a/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc b/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc
index 7ddfcb9..eb4b928 100644
--- a/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc
+++ b/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc
@@ -20,8 +20,6 @@
 #include "chrome/browser/chromeos/cros/mock_library_loader.h"
 #include "chrome/browser/chromeos/cros_settings.h"
 #include "chrome/browser/chromeos/cryptohome/mock_async_method_caller.h"
-#include "chrome/browser/chromeos/dbus/mock_dbus_thread_manager.h"
-#include "chrome/browser/chromeos/dbus/mock_cryptohome_client.h"
 #include "chrome/browser/chromeos/login/mock_login_status_consumer.h"
 #include "chrome/browser/chromeos/login/mock_url_fetchers.h"
 #include "chrome/browser/chromeos/login/mock_user_manager.h"
@@ -30,6 +28,8 @@
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/net/gaia/mock_url_fetcher_factory.h"
 #include "chrome/test/base/testing_profile.h"
+#include "chromeos/dbus/mock_cryptohome_client.h"
+#include "chromeos/dbus/mock_dbus_thread_manager.h"
 #include "content/test/test_browser_thread.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_errors.h"
diff --git a/chrome/browser/chromeos/login/screen_locker.cc b/chrome/browser/chromeos/login/screen_locker.cc
index 94bc647..328c74b 100644
--- a/chrome/browser/chromeos/login/screen_locker.cc
+++ b/chrome/browser/chromeos/login/screen_locker.cc
@@ -16,9 +16,6 @@
 #include "base/string_util.h"
 #include "base/timer.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
-#include "chrome/browser/chromeos/dbus/power_manager_client.h"
-#include "chrome/browser/chromeos/dbus/session_manager_client.h"
 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
 #include "chrome/browser/chromeos/input_method/xkeyboard.h"
@@ -39,6 +36,9 @@
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
+#include "chromeos/dbus/power_manager_client.h"
+#include "chromeos/dbus/session_manager_client.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/user_metrics.h"
diff --git a/chrome/browser/chromeos/login/session_manager_observer.cc b/chrome/browser/chromeos/login/session_manager_observer.cc
index 9f04013..fa4b66c 100644
--- a/chrome/browser/chromeos/login/session_manager_observer.cc
+++ b/chrome/browser/chromeos/login/session_manager_observer.cc
@@ -5,10 +5,10 @@
 #include "chrome/browser/chromeos/login/session_manager_observer.h"
 
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
 #include "chrome/browser/chromeos/login/signed_settings.h"
 #include "chrome/browser/chromeos/login/signed_settings_cache.h"
 #include "chrome/common/chrome_notification_types.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 
diff --git a/chrome/browser/chromeos/login/session_manager_observer.h b/chrome/browser/chromeos/login/session_manager_observer.h
index 83bc025..58f4bc4 100644
--- a/chrome/browser/chromeos/login/session_manager_observer.h
+++ b/chrome/browser/chromeos/login/session_manager_observer.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -8,7 +8,7 @@
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "chrome/browser/chromeos/dbus/session_manager_client.h"
+#include "chromeos/dbus/session_manager_client.h"
 
 namespace chromeos {
 
diff --git a/chrome/browser/chromeos/login/signed_settings.cc b/chrome/browser/chromeos/login/signed_settings.cc
index 0b02bf4..44975d7 100644
--- a/chrome/browser/chromeos/login/signed_settings.cc
+++ b/chrome/browser/chromeos/login/signed_settings.cc
@@ -12,12 +12,12 @@
 #include "base/threading/thread_restrictions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
-#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
-#include "chrome/browser/chromeos/dbus/session_manager_client.h"
 #include "chrome/browser/chromeos/login/authenticator.h"
 #include "chrome/browser/chromeos/login/ownership_service.h"
 #include "chrome/browser/policy/proto/chrome_device_policy.pb.h"
 #include "chrome/browser/policy/proto/device_management_backend.pb.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
+#include "chromeos/dbus/session_manager_client.h"
 #include "content/public/browser/browser_thread.h"
 
 namespace em = enterprise_management;
diff --git a/chrome/browser/chromeos/login/signed_settings_helper_unittest.cc b/chrome/browser/chromeos/login/signed_settings_helper_unittest.cc
index 556611c..463fad5 100644
--- a/chrome/browser/chromeos/login/signed_settings_helper_unittest.cc
+++ b/chrome/browser/chromeos/login/signed_settings_helper_unittest.cc
@@ -8,15 +8,15 @@
 #include "base/message_loop.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros_settings_names.h"
-#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
-#include "chrome/browser/chromeos/dbus/mock_dbus_thread_manager.h"
-#include "chrome/browser/chromeos/dbus/mock_session_manager_client.h"
 #include "chrome/browser/chromeos/login/mock_owner_key_utils.h"
 #include "chrome/browser/chromeos/login/mock_ownership_service.h"
 #include "chrome/browser/chromeos/login/owner_manager.h"
 #include "chrome/browser/chromeos/login/signed_settings.h"
 #include "chrome/browser/policy/proto/chrome_device_policy.pb.h"
 #include "chrome/browser/policy/proto/device_management_backend.pb.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
+#include "chromeos/dbus/mock_dbus_thread_manager.h"
+#include "chromeos/dbus/mock_session_manager_client.h"
 #include "content/test/test_browser_thread.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/chromeos/login/signed_settings_unittest.cc b/chrome/browser/chromeos/login/signed_settings_unittest.cc
index dff8c76..2e61abc 100644
--- a/chrome/browser/chromeos/login/signed_settings_unittest.cc
+++ b/chrome/browser/chromeos/login/signed_settings_unittest.cc
@@ -10,13 +10,13 @@
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/mock_library_loader.h"
 #include "chrome/browser/chromeos/cros_settings_names.h"
-#include "chrome/browser/chromeos/dbus/mock_dbus_thread_manager.h"
-#include "chrome/browser/chromeos/dbus/mock_session_manager_client.h"
 #include "chrome/browser/chromeos/login/mock_owner_key_utils.h"
 #include "chrome/browser/chromeos/login/mock_ownership_service.h"
 #include "chrome/browser/chromeos/login/owner_manager_unittest.h"
 #include "chrome/browser/policy/proto/chrome_device_policy.pb.h"
 #include "chrome/browser/policy/proto/device_management_backend.pb.h"
+#include "chromeos/dbus/mock_dbus_thread_manager.h"
+#include "chromeos/dbus/mock_session_manager_client.h"
 #include "content/test/test_browser_thread.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/chromeos/login/update_screen.cc b/chrome/browser/chromeos/login/update_screen.cc
index 85954be..4f3d7b4 100644
--- a/chrome/browser/chromeos/login/update_screen.cc
+++ b/chrome/browser/chromeos/login/update_screen.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -8,10 +8,10 @@
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/threading/thread_restrictions.h"
-#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
 #include "chrome/browser/chromeos/login/screen_observer.h"
 #include "chrome/browser/chromeos/login/update_screen_actor.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
diff --git a/chrome/browser/chromeos/login/update_screen.h b/chrome/browser/chromeos/login/update_screen.h
index eb3c32f..39e8966 100644
--- a/chrome/browser/chromeos/login/update_screen.h
+++ b/chrome/browser/chromeos/login/update_screen.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -12,9 +12,9 @@
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/timer.h"
-#include "chrome/browser/chromeos/dbus/update_engine_client.h"
 #include "chrome/browser/chromeos/login/update_screen_actor.h"
 #include "chrome/browser/chromeos/login/wizard_screen.h"
+#include "chromeos/dbus/update_engine_client.h"
 
 namespace chromeos {
 
diff --git a/chrome/browser/chromeos/login/update_screen_browsertest.cc b/chrome/browser/chromeos/login/update_screen_browsertest.cc
index abb2008..dd55b2e 100644
--- a/chrome/browser/chromeos/login/update_screen_browsertest.cc
+++ b/chrome/browser/chromeos/login/update_screen_browsertest.cc
@@ -4,13 +4,13 @@
 
 #include "base/message_loop.h"
 #include "chrome/browser/chromeos/cros/mock_network_library.h"
-#include "chrome/browser/chromeos/dbus/mock_dbus_thread_manager.h"
-#include "chrome/browser/chromeos/dbus/mock_session_manager_client.h"
-#include "chrome/browser/chromeos/dbus/mock_update_engine_client.h"
 #include "chrome/browser/chromeos/login/mock_screen_observer.h"
 #include "chrome/browser/chromeos/login/update_screen.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/chromeos/login/wizard_in_process_browser_test.h"
+#include "chromeos/dbus/mock_dbus_thread_manager.h"
+#include "chromeos/dbus/mock_session_manager_client.h"
+#include "chromeos/dbus/mock_update_engine_client.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace chromeos {
diff --git a/chrome/browser/chromeos/login/user_manager_impl.cc b/chrome/browser/chromeos/login/user_manager_impl.cc
index 5ca994d..48e5789 100644
--- a/chrome/browser/chromeos/login/user_manager_impl.cc
+++ b/chrome/browser/chromeos/login/user_manager_impl.cc
@@ -31,8 +31,6 @@
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros_settings.h"
 #include "chrome/browser/chromeos/cryptohome/async_method_caller.h"
-#include "chrome/browser/chromeos/dbus/cryptohome_client.h"
-#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
 #include "chrome/browser/chromeos/login/default_user_images.h"
 #include "chrome/browser/chromeos/login/helper.h"
@@ -51,6 +49,8 @@
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/net/gaia/google_service_auth_error.h"
+#include "chromeos/dbus/cryptohome_client.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/common/url_constants.h"
diff --git a/chrome/browser/chromeos/login/webui_login_view.cc b/chrome/browser/chromeos/login/webui_login_view.cc
index a15eedd..60371ea 100644
--- a/chrome/browser/chromeos/login/webui_login_view.cc
+++ b/chrome/browser/chromeos/login/webui_login_view.cc
@@ -13,8 +13,6 @@
 #include "base/values.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_util.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
-#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
-#include "chrome/browser/chromeos/dbus/session_manager_client.h"
 #include "chrome/browser/chromeos/login/proxy_settings_dialog.h"
 #include "chrome/browser/chromeos/login/webui_login_display.h"
 #include "chrome/browser/chromeos/status/status_area_view.h"
@@ -24,6 +22,8 @@
 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/render_messages.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
+#include "chromeos/dbus/session_manager_client.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_view_host_observer.h"
 #include "content/public/browser/web_contents.h"
diff --git a/chrome/browser/chromeos/net/network_change_notifier_chromeos.cc b/chrome/browser/chromeos/net/network_change_notifier_chromeos.cc
index 8167b23..fe85d23 100644
--- a/chrome/browser/chromeos/net/network_change_notifier_chromeos.cc
+++ b/chrome/browser/chromeos/net/network_change_notifier_chromeos.cc
@@ -6,7 +6,7 @@
 
 #include "base/bind.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
-#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
diff --git a/chrome/browser/chromeos/net/network_change_notifier_chromeos.h b/chrome/browser/chromeos/net/network_change_notifier_chromeos.h
index a2bf168..b63de8c 100644
--- a/chrome/browser/chromeos/net/network_change_notifier_chromeos.h
+++ b/chrome/browser/chromeos/net/network_change_notifier_chromeos.h
@@ -10,7 +10,7 @@
 #include "base/compiler_specific.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
-#include "chrome/browser/chromeos/dbus/power_manager_client.h"
+#include "chromeos/dbus/power_manager_client.h"
 #include "net/base/network_change_notifier.h"
 
 namespace chromeos {
diff --git a/chrome/browser/chromeos/power/brightness_observer.cc b/chrome/browser/chromeos/power/brightness_observer.cc
index a6cd448..0e1712b 100644
--- a/chrome/browser/chromeos/power/brightness_observer.cc
+++ b/chrome/browser/chromeos/power/brightness_observer.cc
@@ -4,10 +4,10 @@
 
 #include "chrome/browser/chromeos/power/brightness_observer.h"
 
-#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
 #include "chrome/browser/chromeos/ui/brightness_bubble.h"
 #include "chrome/browser/chromeos/ui/volume_bubble.h"
 #include "chrome/browser/extensions/system/system_api.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
 
 namespace chromeos {
 
diff --git a/chrome/browser/chromeos/power/brightness_observer.h b/chrome/browser/chromeos/power/brightness_observer.h
index 4b9d6c3..46f78e3 100644
--- a/chrome/browser/chromeos/power/brightness_observer.h
+++ b/chrome/browser/chromeos/power/brightness_observer.h
@@ -8,7 +8,7 @@
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "chrome/browser/chromeos/dbus/power_manager_client.h"
+#include "chromeos/dbus/power_manager_client.h"
 
 namespace chromeos {
 
diff --git a/chrome/browser/chromeos/power/low_battery_observer.h b/chrome/browser/chromeos/power/low_battery_observer.h
index dc4fc0c..77d290d 100644
--- a/chrome/browser/chromeos/power/low_battery_observer.h
+++ b/chrome/browser/chromeos/power/low_battery_observer.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -9,8 +9,8 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/time.h"
-#include "chrome/browser/chromeos/dbus/power_manager_client.h"
 #include "chrome/browser/chromeos/notifications/system_notification.h"
+#include "chromeos/dbus/power_manager_client.h"
 
 class Profile;
 
diff --git a/chrome/browser/chromeos/power/power_button_controller_delegate_chromeos.cc b/chrome/browser/chromeos/power/power_button_controller_delegate_chromeos.cc
index 12ae439..b7e2e1e 100644
--- a/chrome/browser/chromeos/power/power_button_controller_delegate_chromeos.cc
+++ b/chrome/browser/chromeos/power/power_button_controller_delegate_chromeos.cc
@@ -5,10 +5,10 @@
 #include "chrome/browser/chromeos/power/power_button_controller_delegate_chromeos.h"
 
 #include "base/logging.h"
-#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
-#include "chrome/browser/chromeos/dbus/power_manager_client.h"
 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
 #include "chrome/browser/ui/browser_list.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
+#include "chromeos/dbus/power_manager_client.h"
 
 namespace chromeos {
 
diff --git a/chrome/browser/chromeos/power/power_button_observer.cc b/chrome/browser/chromeos/power/power_button_observer.cc
index 86a24f2..b7c0707 100644
--- a/chrome/browser/chromeos/power/power_button_observer.cc
+++ b/chrome/browser/chromeos/power/power_button_observer.cc
@@ -7,12 +7,12 @@
 #include "ash/shell.h"
 #include "ash/wm/power_button_controller.h"
 #include "base/logging.h"
-#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
 #include "chrome/browser/chromeos/login/screen_locker.h"
 #include "chrome/browser/chromeos/login/user.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/power/power_button_controller_delegate_chromeos.h"
 #include "chrome/common/chrome_notification_types.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
 #include "content/public/browser/notification_service.h"
 
 namespace chromeos {
diff --git a/chrome/browser/chromeos/power/power_button_observer.h b/chrome/browser/chromeos/power/power_button_observer.h
index f2e6ab0..6cbd402 100644
--- a/chrome/browser/chromeos/power/power_button_observer.h
+++ b/chrome/browser/chromeos/power/power_button_observer.h
@@ -8,7 +8,7 @@
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "chrome/browser/chromeos/dbus/power_manager_client.h"
+#include "chromeos/dbus/power_manager_client.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
diff --git a/chrome/browser/chromeos/power/power_state_override.cc b/chrome/browser/chromeos/power/power_state_override.cc
index 8b7234f..b461fd5 100644
--- a/chrome/browser/chromeos/power/power_state_override.cc
+++ b/chrome/browser/chromeos/power/power_state_override.cc
@@ -7,8 +7,8 @@
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "base/time.h"
-#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
-#include "chrome/browser/chromeos/dbus/power_manager_client.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
+#include "chromeos/dbus/power_manager_client.h"
 
 using chromeos::PowerManagerClient;
 
diff --git a/chrome/browser/chromeos/power/resume_observer.cc b/chrome/browser/chromeos/power/resume_observer.cc
index 3b6783e..b84a272 100644
--- a/chrome/browser/chromeos/power/resume_observer.cc
+++ b/chrome/browser/chromeos/power/resume_observer.cc
@@ -4,8 +4,8 @@
 
 #include "chrome/browser/chromeos/power/resume_observer.h"
 
-#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
 #include "chrome/browser/extensions/system/system_api.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
 
 namespace chromeos {
 
diff --git a/chrome/browser/chromeos/power/resume_observer.h b/chrome/browser/chromeos/power/resume_observer.h
index 03c65d1..2e749fb 100644
--- a/chrome/browser/chromeos/power/resume_observer.h
+++ b/chrome/browser/chromeos/power/resume_observer.h
@@ -8,7 +8,7 @@
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "chrome/browser/chromeos/dbus/power_manager_client.h"
+#include "chromeos/dbus/power_manager_client.h"
 
 namespace chromeos {
 
diff --git a/chrome/browser/chromeos/power/screen_lock_observer.cc b/chrome/browser/chromeos/power/screen_lock_observer.cc
index c234e36..1e5039f 100644
--- a/chrome/browser/chromeos/power/screen_lock_observer.cc
+++ b/chrome/browser/chromeos/power/screen_lock_observer.cc
@@ -4,8 +4,8 @@
 
 #include "chrome/browser/chromeos/power/screen_lock_observer.h"
 
-#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
 #include "chrome/browser/extensions/system/system_api.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
 
 namespace chromeos {
 
diff --git a/chrome/browser/chromeos/power/screen_lock_observer.h b/chrome/browser/chromeos/power/screen_lock_observer.h
index 2f04cf3..ff34365 100644
--- a/chrome/browser/chromeos/power/screen_lock_observer.h
+++ b/chrome/browser/chromeos/power/screen_lock_observer.h
@@ -8,7 +8,7 @@
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "chrome/browser/chromeos/dbus/power_manager_client.h"
+#include "chromeos/dbus/power_manager_client.h"
 
 namespace chromeos {
 
diff --git a/chrome/browser/chromeos/proxy_config_service_impl_unittest.cc b/chrome/browser/chromeos/proxy_config_service_impl_unittest.cc
index 29097fa..cfc1101a 100644
--- a/chrome/browser/chromeos/proxy_config_service_impl_unittest.cc
+++ b/chrome/browser/chromeos/proxy_config_service_impl_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -14,9 +14,9 @@
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
-#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_pref_service.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
 #include "content/test/test_browser_thread.h"
 #include "net/proxy/proxy_config_service_common_unittest.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/chromeos/status/clock_updater.cc b/chrome/browser/chromeos/status/clock_updater.cc
index 03dbda4..26ac9c2 100644
--- a/chrome/browser/chromeos/status/clock_updater.cc
+++ b/chrome/browser/chromeos/status/clock_updater.cc
@@ -4,9 +4,9 @@
 
 #include "chrome/browser/chromeos/status/clock_updater.h"
 
-#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
 #include "chrome/browser/chromeos/status/clock_menu_button.h"
 #include "chrome/browser/chromeos/system/timezone_settings.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
 
 ClockUpdater::ClockUpdater(ClockMenuButton* button)
     : button_(button) {
diff --git a/chrome/browser/chromeos/status/clock_updater.h b/chrome/browser/chromeos/status/clock_updater.h
index cf52855..db75ea2 100644
--- a/chrome/browser/chromeos/status/clock_updater.h
+++ b/chrome/browser/chromeos/status/clock_updater.h
@@ -6,8 +6,8 @@
 #define CHROME_BROWSER_CHROMEOS_STATUS_CLOCK_UPDATER_H_
 #pragma once
 
-#include "chrome/browser/chromeos/dbus/power_manager_client.h"
 #include "chrome/browser/chromeos/system/timezone_settings.h"
+#include "chromeos/dbus/power_manager_client.h"
 
 class ClockMenuButton;
 
diff --git a/chrome/browser/chromeos/status/power_menu_button.cc b/chrome/browser/chromeos/status/power_menu_button.cc
index dd2e943..5369b79 100644
--- a/chrome/browser/chromeos/status/power_menu_button.cc
+++ b/chrome/browser/chromeos/status/power_menu_button.cc
@@ -11,9 +11,9 @@
 #include "base/stringprintf.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
 #include "chrome/browser/chromeos/status/status_area_bubble.h"
 #include "chrome/browser/chromeos/view_ids.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
diff --git a/chrome/browser/chromeos/status/power_menu_button.h b/chrome/browser/chromeos/status/power_menu_button.h
index 1c01ea8..7d29144 100644
--- a/chrome/browser/chromeos/status/power_menu_button.h
+++ b/chrome/browser/chromeos/status/power_menu_button.h
@@ -7,8 +7,8 @@
 #pragma once
 
 #include "base/compiler_specific.h"
-#include "chrome/browser/chromeos/dbus/power_manager_client.h"
 #include "chrome/browser/chromeos/status/status_area_button.h"
+#include "chromeos/dbus/power_manager_client.h"
 #include "ui/views/controls/button/menu_button_listener.h"
 #include "ui/views/controls/menu/menu_delegate.h"
 
diff --git a/chrome/browser/chromeos/status/status_area_view_chromeos.cc b/chrome/browser/chromeos/status/status_area_view_chromeos.cc
index 84ca022..5503b49 100644
--- a/chrome/browser/chromeos/status/status_area_view_chromeos.cc
+++ b/chrome/browser/chromeos/status/status_area_view_chromeos.cc
@@ -5,7 +5,6 @@
 #include "chrome/browser/chromeos/status/status_area_view_chromeos.h"
 
 #include "base/command_line.h"
-#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
 #include "chrome/browser/chromeos/status/accessibility_menu_button.h"
 #include "chrome/browser/chromeos/status/caps_lock_menu_button.h"
 #include "chrome/browser/chromeos/status/clock_menu_button.h"
@@ -16,6 +15,7 @@
 #include "chrome/browser/chromeos/status/volume_menu_button.h"
 #include "chrome/browser/chromeos/view_ids.h"
 #include "chrome/common/chrome_switches.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
 
 namespace chromeos {
 
diff --git a/chrome/browser/chromeos/status/status_area_view_chromeos.h b/chrome/browser/chromeos/status/status_area_view_chromeos.h
index 3edcca2..6e6a42b 100644
--- a/chrome/browser/chromeos/status/status_area_view_chromeos.h
+++ b/chrome/browser/chromeos/status/status_area_view_chromeos.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -8,9 +8,9 @@
 
 #include "chrome/browser/chromeos/status/status_area_view.h"
 
-#include "chrome/browser/chromeos/dbus/power_manager_client.h"
 #include "chrome/browser/chromeos/system/timezone_settings.h"
 #include "chrome/browser/chromeos/view_ids.h"
+#include "chromeos/dbus/power_manager_client.h"
 
 class ClockMenuButton;
 
diff --git a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
index 22dc446..85984fb 100644
--- a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
+++ b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
@@ -28,8 +28,6 @@
 #include "chrome/browser/chromeos/bluetooth/bluetooth_device.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
-#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
-#include "chrome/browser/chromeos/dbus/power_manager_client.h"
 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
 #include "chrome/browser/chromeos/input_method/input_method_whitelist.h"
@@ -51,8 +49,10 @@
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/upgrade_detector.h"
-#include "chrome/common/pref_names.h"
 #include "chrome/common/chrome_notification_types.h"
+#include "chrome/common/pref_names.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
+#include "chromeos/dbus/power_manager_client.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_service.h"
 #include "grit/generated_resources.h"
diff --git a/chrome/browser/chromeos/upgrade_detector_chromeos.cc b/chrome/browser/chromeos/upgrade_detector_chromeos.cc
index 40d77fa..e66dbdf 100644
--- a/chrome/browser/chromeos/upgrade_detector_chromeos.cc
+++ b/chrome/browser/chromeos/upgrade_detector_chromeos.cc
@@ -1,11 +1,11 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/upgrade_detector_chromeos.h"
 
 #include "base/memory/singleton.h"
-#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
 
 namespace {
 
diff --git a/chrome/browser/chromeos/upgrade_detector_chromeos.h b/chrome/browser/chromeos/upgrade_detector_chromeos.h
index 7e80537..c0aaa4c 100644
--- a/chrome/browser/chromeos/upgrade_detector_chromeos.h
+++ b/chrome/browser/chromeos/upgrade_detector_chromeos.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -8,8 +8,8 @@
 
 #include "base/compiler_specific.h"
 #include "base/timer.h"
-#include "chrome/browser/chromeos/dbus/update_engine_client.h"
 #include "chrome/browser/upgrade_detector.h"
+#include "chromeos/dbus/update_engine_client.h"
 
 template <typename T> struct DefaultSingletonTraits;
 
diff --git a/chrome/browser/extensions/system/system_api.cc b/chrome/browser/extensions/system/system_api.cc
index c92ad6d..b80538f 100644
--- a/chrome/browser/extensions/system/system_api.cc
+++ b/chrome/browser/extensions/system/system_api.cc
@@ -13,8 +13,8 @@
 #include "chrome/common/pref_names.h"
 
 #if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
-#include "chrome/browser/chromeos/dbus/update_engine_client.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
+#include "chromeos/dbus/update_engine_client.h"
 #else
 #include "chrome/browser/upgrade_detector.h"
 #endif
diff --git a/chrome/browser/extensions/system/system_apitest.cc b/chrome/browser/extensions/system/system_apitest.cc
index 900669c..213a648 100644
--- a/chrome/browser/extensions/system/system_apitest.cc
+++ b/chrome/browser/extensions/system/system_apitest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -9,8 +9,8 @@
 #include "chrome/common/pref_names.h"
 
 #if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/dbus/mock_dbus_thread_manager.h"
-#include "chrome/browser/chromeos/dbus/mock_update_engine_client.h"
+#include "chromeos/dbus/mock_dbus_thread_manager.h"
+#include "chromeos/dbus/mock_update_engine_client.h"
 
 using chromeos::UpdateEngineClient;
 using ::testing::Return;
diff --git a/chrome/browser/idle_chromeos.cc b/chrome/browser/idle_chromeos.cc
index ee9e055..d8f2f08 100644
--- a/chrome/browser/idle_chromeos.cc
+++ b/chrome/browser/idle_chromeos.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -6,11 +6,8 @@
 
 #include "base/bind.h"
 #include "base/callback.h"
-#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
-#include "chrome/browser/chromeos/dbus/power_manager_client.h"
-#if !defined(USE_AURA)
-#include "chrome/browser/screensaver_window_finder_gtk.h"
-#endif
+#include "chromeos/dbus/dbus_thread_manager.h"
+#include "chromeos/dbus/power_manager_client.h"
 
 void CalculateIdleStateNotifier(unsigned int idle_treshold,
                                 IdleCallback notify,
@@ -25,10 +22,6 @@ void CalculateIdleStateNotifier(unsigned int idle_treshold,
 }
 
 void CalculateIdleState(unsigned int idle_threshold, IdleCallback notify) {
-  if (CheckIdleStateIsLocked()) {
-    notify.Run(IDLE_STATE_LOCKED);
-    return;
-  }
   chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->
       CalculateIdleTime(base::Bind(&CalculateIdleStateNotifier, idle_threshold,
                                    notify));
@@ -37,9 +30,6 @@ void CalculateIdleState(unsigned int idle_threshold, IdleCallback notify) {
 bool CheckIdleStateIsLocked() {
   // Usually the screensaver is used to lock the screen, so we do not need to
   // check if the workstation is locked.
-#if defined(USE_AURA)
+  // TODO(oshima): Verify if this behavior is correct.
   return false;
-#else
-  return ScreensaverWindowFinder::ScreensaverWindowExists();
-#endif
 }
diff --git a/chrome/browser/policy/device_policy_cache.cc b/chrome/browser/policy/device_policy_cache.cc
index 2a16db9..c7befed 100644
--- a/chrome/browser/policy/device_policy_cache.cc
+++ b/chrome/browser/policy/device_policy_cache.cc
@@ -16,8 +16,6 @@
 #include "base/metrics/histogram.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/cros_settings.h"
-#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
-#include "chrome/browser/chromeos/dbus/update_engine_client.h"
 #include "chrome/browser/chromeos/login/authenticator.h"
 #include "chrome/browser/chromeos/login/ownership_service.h"
 #include "chrome/browser/chromeos/login/signed_settings_helper.h"
@@ -28,6 +26,8 @@
 #include "chrome/browser/policy/policy_map.h"
 #include "chrome/browser/policy/proto/device_management_backend.pb.h"
 #include "chrome/browser/policy/proto/device_management_local.pb.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
+#include "chromeos/dbus/update_engine_client.h"
 #include "policy/policy_constants.h"
 
 using google::protobuf::RepeatedPtrField;
diff --git a/chrome/browser/speech/extension_api/tts_extension_api_chromeos.cc b/chrome/browser/speech/extension_api/tts_extension_api_chromeos.cc
index 590ae7d..e0408a4 100644
--- a/chrome/browser/speech/extension_api/tts_extension_api_chromeos.cc
+++ b/chrome/browser/speech/extension_api/tts_extension_api_chromeos.cc
@@ -12,10 +12,10 @@
 #include "base/message_loop.h"
 #include "base/stl_util.h"
 #include "base/string_number_conversions.h"
-#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
-#include "chrome/browser/chromeos/dbus/speech_synthesizer_client.h"
 #include "chrome/browser/speech/extension_api/tts_extension_api_controller.h"
 #include "chrome/browser/speech/extension_api/tts_extension_api_platform.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
+#include "chromeos/dbus/speech_synthesizer_client.h"
 
 using base::DoubleToString;
 
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 0d82525..2885e37 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -203,10 +203,10 @@
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/boot_times_loader.h"
-#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
-#include "chrome/browser/chromeos/dbus/power_manager_client.h"
 #include "chrome/browser/chromeos/gdata/gdata_util.h"
 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
+#include "chromeos/dbus/power_manager_client.h"
 #if defined(USE_AURA)
 #include "chrome/browser/extensions/api/terminal/terminal_extension_helper.h"
 #endif
diff --git a/chrome/browser/ui/browser_init.cc b/chrome/browser/ui/browser_init.cc
index 5dcd96eb..0212aa4 100644
--- a/chrome/browser/ui/browser_init.cc
+++ b/chrome/browser/ui/browser_init.cc
@@ -114,12 +114,12 @@
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/customization_document.h"
-#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
 #include "chrome/browser/chromeos/enterprise_extension_observer.h"
 #include "chrome/browser/chromeos/gview_request_interceptor.h"
 #include "chrome/browser/chromeos/network_message_observer.h"
 #include "chrome/browser/chromeos/power/low_battery_observer.h"
 #include "chrome/browser/chromeos/sms_observer.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
 #endif
 
 #if defined(TOOLKIT_VIEWS) && defined(OS_LINUX)
diff --git a/chrome/browser/ui/browser_list.cc b/chrome/browser/ui/browser_list.cc
index 1782967..abdb135 100644
--- a/chrome/browser/ui/browser_list.cc
+++ b/chrome/browser/ui/browser_list.cc
@@ -37,10 +37,10 @@
 #if defined(OS_CHROMEOS)
 #include "base/chromeos/chromeos_version.h"
 #include "chrome/browser/chromeos/boot_times_loader.h"
-#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
-#include "chrome/browser/chromeos/dbus/session_manager_client.h"
-#include "chrome/browser/chromeos/dbus/update_engine_client.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
+#include "chromeos/dbus/session_manager_client.h"
+#include "chromeos/dbus/update_engine_client.h"
 #endif
 
 using content::WebContents;
diff --git a/chrome/browser/ui/views/ash/brightness_controller_chromeos.cc b/chrome/browser/ui/views/ash/brightness_controller_chromeos.cc
index 19faf15..9099445 100644
--- a/chrome/browser/ui/views/ash/brightness_controller_chromeos.cc
+++ b/chrome/browser/ui/views/ash/brightness_controller_chromeos.cc
@@ -4,8 +4,8 @@
 
 #include "chrome/browser/ui/views/ash/brightness_controller_chromeos.h"
 
-#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
-#include "chrome/browser/chromeos/dbus/power_manager_client.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
+#include "chromeos/dbus/power_manager_client.h"
 #include "content/public/browser/user_metrics.h"
 #include "ui/base/accelerators/accelerator.h"
 
diff --git a/chrome/browser/ui/views/ash/chrome_shell_delegate.cc b/chrome/browser/ui/views/ash/chrome_shell_delegate.cc
index 4c0006f..4aa8672 100644
--- a/chrome/browser/ui/views/ash/chrome_shell_delegate.cc
+++ b/chrome/browser/ui/views/ash/chrome_shell_delegate.cc
@@ -26,11 +26,11 @@
 #if defined(OS_CHROMEOS)
 #include "base/chromeos/chromeos_version.h"
 #include "chrome/browser/chromeos/background/desktop_background_observer.h"
-#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
-#include "chrome/browser/chromeos/dbus/power_manager_client.h"
 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/system/ash_system_tray_delegate.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
+#include "chromeos/dbus/power_manager_client.h"
 #endif
 
 // static
diff --git a/chrome/browser/ui/views/update_recommended_message_box.cc b/chrome/browser/ui/views/update_recommended_message_box.cc
index 6a5d49a..39fd38c 100644
--- a/chrome/browser/ui/views/update_recommended_message_box.cc
+++ b/chrome/browser/ui/views/update_recommended_message_box.cc
@@ -17,8 +17,8 @@
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/cros/cros_library.h"
-#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
-#include "chrome/browser/chromeos/dbus/power_manager_client.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
+#include "chromeos/dbus/power_manager_client.h"
 #endif
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/chrome/browser/ui/webui/about_ui.cc b/chrome/browser/ui/webui/about_ui.cc
index 0de20dc..84921a4 100644
--- a/chrome/browser/ui/webui/about_ui.cc
+++ b/chrome/browser/ui/webui/about_ui.cc
@@ -76,11 +76,11 @@
 #include "chrome/browser/chromeos/cros/cryptohome_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/customization_document.h"
-#include "chrome/browser/chromeos/dbus/cryptohome_client.h"
-#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/chromeos/version_loader.h"
 #include "chrome/browser/oom_priority_manager.h"
+#include "chromeos/dbus/cryptohome_client.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
 #include "content/public/browser/zygote_host_linux.h"
 #elif defined(OS_LINUX) || defined(OS_OPENBSD)
 #include "content/public/browser/zygote_host_linux.h"
diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
index 3719ea3..106521a 100644
--- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
@@ -17,8 +17,6 @@
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/cros_settings.h"
-#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
-#include "chrome/browser/chromeos/dbus/power_manager_client.h"
 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
 #include "chrome/browser/chromeos/input_method/xkeyboard.h"
 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
@@ -33,6 +31,8 @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/net/gaia/gaia_urls.h"
 #include "chrome/common/url_constants.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
+#include "chromeos/dbus/power_manager_client.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
diff --git a/chrome/browser/ui/webui/help/version_updater_chromeos.cc b/chrome/browser/ui/webui/help/version_updater_chromeos.cc
index 7fdb629..640a2fe 100644
--- a/chrome/browser/ui/webui/help/version_updater_chromeos.cc
+++ b/chrome/browser/ui/webui/help/version_updater_chromeos.cc
@@ -8,10 +8,10 @@
 #include "base/bind_helpers.h"
 #include "chrome/browser/chromeos/cros_settings.h"
 #include "chrome/browser/chromeos/cros_settings_names.h"
-#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
-#include "chrome/browser/chromeos/dbus/power_manager_client.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
+#include "chromeos/dbus/power_manager_client.h"
 
 using chromeos::CrosSettings;
 using chromeos::DBusThreadManager;
diff --git a/chrome/browser/ui/webui/help/version_updater_chromeos.h b/chrome/browser/ui/webui/help/version_updater_chromeos.h
index 39cc307..aed47c7 100644
--- a/chrome/browser/ui/webui/help/version_updater_chromeos.h
+++ b/chrome/browser/ui/webui/help/version_updater_chromeos.h
@@ -7,8 +7,8 @@
 #pragma once
 
 #include "base/compiler_specific.h"
-#include "chrome/browser/chromeos/dbus/update_engine_client.h"
 #include "chrome/browser/ui/webui/help/version_updater.h"
+#include "chromeos/dbus/update_engine_client.h"
 
 class VersionUpdaterCros : public VersionUpdater,
                            public chromeos::UpdateEngineClient::Observer {
diff --git a/chrome/browser/ui/webui/options2/certificate_manager_handler2.cc b/chrome/browser/ui/webui/options2/certificate_manager_handler2.cc
index d237ea1..9077558 100644
--- a/chrome/browser/ui/webui/options2/certificate_manager_handler2.cc
+++ b/chrome/browser/ui/webui/options2/certificate_manager_handler2.cc
@@ -26,8 +26,8 @@
 #include "ui/base/l10n/l10n_util_collator.h"
 
 #if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/dbus/cryptohome_client.h"
-#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
+#include "chromeos/dbus/cryptohome_client.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
 #endif
 
 using content::BrowserThread;
diff --git a/chrome/browser/ui/webui/options2/certificate_manager_handler2.h b/chrome/browser/ui/webui/options2/certificate_manager_handler2.h
index 2ee0e6e..f3d5ffd1 100644
--- a/chrome/browser/ui/webui/options2/certificate_manager_handler2.h
+++ b/chrome/browser/ui/webui/options2/certificate_manager_handler2.h
@@ -19,7 +19,7 @@
 #include "ui/gfx/native_widget_types.h"
 
 #if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/dbus/cryptohome_client.h"
+#include "chromeos/dbus/cryptohome_client.h"
 #endif
 
 namespace options2 {
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index cc07d28..a260ba1 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -470,59 +470,12 @@
         'browser/chromeos/cryptohome/async_method_caller.h',
         'browser/chromeos/customization_document.cc',
         'browser/chromeos/customization_document.h',
-        'browser/chromeos/dbus/blocking_method_caller.cc',
-        'browser/chromeos/dbus/blocking_method_caller.h',
-        'browser/chromeos/dbus/bluetooth_adapter_client.cc',
-        'browser/chromeos/dbus/bluetooth_adapter_client.h',
-        'browser/chromeos/dbus/bluetooth_agent_service_provider.cc',
-        'browser/chromeos/dbus/bluetooth_agent_service_provider.h',
-        'browser/chromeos/dbus/bluetooth_device_client.cc',
-        'browser/chromeos/dbus/bluetooth_device_client.h',
-        'browser/chromeos/dbus/bluetooth_input_client.cc',
-        'browser/chromeos/dbus/bluetooth_input_client.h',
-        'browser/chromeos/dbus/bluetooth_manager_client.cc',
-        'browser/chromeos/dbus/bluetooth_manager_client.h',
-        'browser/chromeos/dbus/bluetooth_node_client.cc',
-        'browser/chromeos/dbus/bluetooth_node_client.h',
-        'browser/chromeos/dbus/bluetooth_property.cc',
-        'browser/chromeos/dbus/bluetooth_property.h',
-        'browser/chromeos/dbus/cashew_client.cc',
-        'browser/chromeos/dbus/cashew_client.h',
-        'browser/chromeos/dbus/cros_disks_client.cc',
-        'browser/chromeos/dbus/cros_disks_client.h',
-        'browser/chromeos/dbus/cryptohome_client.cc',
-        'browser/chromeos/dbus/cryptohome_client.h',
         'browser/chromeos/dbus/cros_dbus_service.cc',
         'browser/chromeos/dbus/cros_dbus_service.h',
-        'browser/chromeos/dbus/dbus_client_implementation_type.h',
-        'browser/chromeos/dbus/dbus_thread_manager.cc',
-        'browser/chromeos/dbus/dbus_thread_manager.h',
-        'browser/chromeos/dbus/debug_daemon_client.cc',
-        'browser/chromeos/dbus/debug_daemon_client.h',
-        'browser/chromeos/dbus/flimflam_ipconfig_client.cc',
-        'browser/chromeos/dbus/flimflam_ipconfig_client.h',
-        'browser/chromeos/dbus/flimflam_client_helper.cc',
-        'browser/chromeos/dbus/flimflam_client_helper.h',
-        'browser/chromeos/dbus/flimflam_network_client.cc',
-        'browser/chromeos/dbus/flimflam_network_client.h',
-        'browser/chromeos/dbus/flimflam_profile_client.cc',
-        'browser/chromeos/dbus/flimflam_profile_client.h',
-        'browser/chromeos/dbus/image_burner_client.cc',
-        'browser/chromeos/dbus/image_burner_client.h',
-        'browser/chromeos/dbus/introspectable_client.cc',
-        'browser/chromeos/dbus/introspectable_client.h',
         'browser/chromeos/dbus/introspect_util.cc',
         'browser/chromeos/dbus/introspect_util.h',
-        'browser/chromeos/dbus/power_manager_client.cc',
-        'browser/chromeos/dbus/power_manager_client.h',
         'browser/chromeos/dbus/proxy_resolution_service_provider.cc',
         'browser/chromeos/dbus/proxy_resolution_service_provider.h',
-        'browser/chromeos/dbus/session_manager_client.cc',
-        'browser/chromeos/dbus/session_manager_client.h',
-        'browser/chromeos/dbus/speech_synthesizer_client.cc',
-        'browser/chromeos/dbus/speech_synthesizer_client.h',
-        'browser/chromeos/dbus/update_engine_client.cc',
-        'browser/chromeos/dbus/update_engine_client.h',
         'browser/chromeos/disks/disk_mount_manager.cc',
         'browser/chromeos/disks/disk_mount_manager.h',
         'browser/chromeos/enrollment_dialog_view.cc',
@@ -4224,8 +4177,6 @@
             '../third_party/libevent/libevent.gyp:libevent',
             '../third_party/mozc/chrome/chromeos/renderer/chromeos_renderer.gyp:mozc_candidates_proto',
             'browser/chromeos/input_method/input_method.gyp:gencode',
-            'power_supply_properties_proto',
-            'power_state_control_proto',
           ],
           'sources!': [
             'browser/first_run/upgrade_util.cc',
@@ -5284,41 +5235,5 @@
       },
       'includes': [ '../build/protoc.gypi' ]
     },
-    {
-      # Protobuf compiler / generator for the PowerSupplyProperties protocol
-      # buffer.
-      'target_name': 'power_supply_properties_proto',
-      'type': 'static_library',
-      'conditions': [
-        ['chromeos==1', {
-         'sources': [
-           '../third_party/cros_system_api/dbus/power_supply_properties.proto',
-         ],
-         'variables': {
-          'proto_in_dir': '../third_party/cros_system_api/dbus/',
-          'proto_out_dir': 'chrome/browser/chromeos/dbus',
-         },
-         'includes': ['../build/protoc.gypi'],
-        }],
-      ],
-    },
-    {
-      # Protobuf compiler / generator for the PowerSupplyProperties protocol
-      # buffer.
-      'target_name': 'power_state_control_proto',
-      'type': 'static_library',
-      'conditions': [
-        ['chromeos==1', {
-         'sources': [
-           '../third_party/cros_system_api/dbus/power_state_control.proto',
-         ],
-         'variables': {
-          'proto_in_dir': '../third_party/cros_system_api/dbus/',
-          'proto_out_dir': 'chrome/browser/chromeos/dbus',
-         },
-         'includes': ['../build/protoc.gypi'],
-        }],
-      ],
-    },
   ],
 }
diff --git a/chrome/chrome_browser_extensions.gypi b/chrome/chrome_browser_extensions.gypi
index d41354f..8c4dfac 100644
--- a/chrome/chrome_browser_extensions.gypi
+++ b/chrome/chrome_browser_extensions.gypi
@@ -487,7 +487,6 @@
             '../third_party/libevent/libevent.gyp:libevent',
             '../third_party/mozc/chrome/chromeos/renderer/chromeos_renderer.gyp:mozc_candidates_proto',
             'browser/chromeos/input_method/input_method.gyp:gencode',
-            'power_supply_properties_proto',
           ],
           'sources!': [
             'browser/extensions/default_apps.cc',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 98f2c0d..4e12e0a 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -94,44 +94,6 @@
         'browser/chromeos/cros/mock_network_library.h',
         'browser/chromeos/cryptohome/mock_async_method_caller.cc',
         'browser/chromeos/cryptohome/mock_async_method_caller.h',
-        'browser/chromeos/dbus/mock_bluetooth_adapter_client.cc',
-        'browser/chromeos/dbus/mock_bluetooth_adapter_client.h',
-        'browser/chromeos/dbus/mock_bluetooth_device_client.cc',
-        'browser/chromeos/dbus/mock_bluetooth_device_client.h',
-        'browser/chromeos/dbus/mock_bluetooth_input_client.cc',
-        'browser/chromeos/dbus/mock_bluetooth_input_client.h',
-        'browser/chromeos/dbus/mock_bluetooth_manager_client.cc',
-        'browser/chromeos/dbus/mock_bluetooth_manager_client.h',
-        'browser/chromeos/dbus/mock_bluetooth_node_client.cc',
-        'browser/chromeos/dbus/mock_bluetooth_node_client.h',
-        'browser/chromeos/dbus/mock_cros_disks_client.cc',
-        'browser/chromeos/dbus/mock_cros_disks_client.h',
-        'browser/chromeos/dbus/mock_cashew_client.cc',
-        'browser/chromeos/dbus/mock_cashew_client.h',
-        'browser/chromeos/dbus/mock_cryptohome_client.cc',
-        'browser/chromeos/dbus/mock_cryptohome_client.h',
-        'browser/chromeos/dbus/mock_dbus_thread_manager.cc',
-        'browser/chromeos/dbus/mock_dbus_thread_manager.h',
-        'browser/chromeos/dbus/mock_debug_daemon_client.cc',
-        'browser/chromeos/dbus/mock_debug_daemon_client.h',
-        'browser/chromeos/dbus/mock_flimflam_ipconfig_client.cc',
-        'browser/chromeos/dbus/mock_flimflam_ipconfig_client.h',
-        'browser/chromeos/dbus/mock_flimflam_network_client.cc',
-        'browser/chromeos/dbus/mock_flimflam_network_client.h',
-        'browser/chromeos/dbus/mock_flimflam_profile_client.cc',
-        'browser/chromeos/dbus/mock_flimflam_profile_client.h',
-        'browser/chromeos/dbus/mock_image_burner_client.cc',
-        'browser/chromeos/dbus/mock_image_burner_client.h',
-        'browser/chromeos/dbus/mock_introspectable_client.cc',
-        'browser/chromeos/dbus/mock_introspectable_client.h',
-        'browser/chromeos/dbus/mock_power_manager_client.cc',
-        'browser/chromeos/dbus/mock_power_manager_client.h',
-        'browser/chromeos/dbus/mock_session_manager_client.cc',
-        'browser/chromeos/dbus/mock_session_manager_client.h',
-        'browser/chromeos/dbus/mock_speech_synthesizer_client.cc',
-        'browser/chromeos/dbus/mock_speech_synthesizer_client.h',
-        'browser/chromeos/dbus/mock_update_engine_client.cc',
-        'browser/chromeos/dbus/mock_update_engine_client.h',
         'browser/chromeos/login/mock_login_status_consumer.cc',
         'browser/chromeos/login/mock_login_status_consumer.h',
         'browser/chromeos/login/mock_login_utils.cc',
@@ -307,6 +269,7 @@
         ['chromeos==1', {
           'dependencies': [
             '../build/linux/system.gyp:dbus',
+            '../chromeos/chromeos.gyp:chromeos_test_support',
           ],
         }],
         ['toolkit_uses_gtk == 1', {
@@ -1318,11 +1281,7 @@
         'browser/chromeos/cros/onc_network_parser_unittest.cc',
         'browser/chromeos/cros_settings_unittest.cc',
         'browser/chromeos/customization_document_unittest.cc',
-        'browser/chromeos/dbus/blocking_method_caller_unittest.cc',
         'browser/chromeos/dbus/cros_dbus_service_unittest.cc',
-        'browser/chromeos/dbus/flimflam_client_unittest_base.cc',
-        'browser/chromeos/dbus/flimflam_client_unittest_base.h',
-        'browser/chromeos/dbus/flimflam_network_client_unittest.cc',
         'browser/chromeos/dbus/introspect_util_unittest.cc',
         'browser/chromeos/dbus/proxy_resolution_service_provider_unittest.cc',
         'browser/chromeos/extensions/file_browser_notifications_unittest.cc',
diff --git a/chromeos/chromeos.gyp b/chromeos/chromeos.gyp
index bf6bd00..0dccb66 100644
--- a/chromeos/chromeos.gyp
+++ b/chromeos/chromeos.gyp
@@ -12,12 +12,169 @@
       'type': '<(component)',
       'dependencies': [
         '../base/base.gyp:base',
+        '../build/linux/system.gyp:dbus',
+        '../dbus/dbus.gyp:dbus',
+        '../net/net.gyp:net',
+        'power_state_control_proto',
+        'power_supply_properties_proto',
       ],
       'sources': [
         'chromeos_export.h',
+        'dbus/blocking_method_caller.cc',
+        'dbus/blocking_method_caller.h',
+        'dbus/bluetooth_adapter_client.cc',
+        'dbus/bluetooth_adapter_client.h',
+        'dbus/bluetooth_agent_service_provider.cc',
+        'dbus/bluetooth_agent_service_provider.h',
+        'dbus/bluetooth_device_client.cc',
+        'dbus/bluetooth_device_client.h',
+        'dbus/bluetooth_input_client.cc',
+        'dbus/bluetooth_input_client.h',
+        'dbus/bluetooth_manager_client.cc',
+        'dbus/bluetooth_manager_client.h',
+        'dbus/bluetooth_node_client.cc',
+        'dbus/bluetooth_node_client.h',
+        'dbus/bluetooth_property.cc',
+        'dbus/bluetooth_property.h',
+        'dbus/cashew_client.cc',
+        'dbus/cashew_client.h',
+        'dbus/cros_disks_client.cc',
+        'dbus/cros_disks_client.h',
+        'dbus/cryptohome_client.cc',
+        'dbus/cryptohome_client.h',
+        'dbus/dbus_client_implementation_type.h',
+        'dbus/dbus_method_call_status.h',
+        'dbus/dbus_thread_manager.cc',
+        'dbus/dbus_thread_manager.h',
+        'dbus/debug_daemon_client.cc',
+        'dbus/debug_daemon_client.h',
+        'dbus/cryptohome_client.h',
+        'dbus/flimflam_ipconfig_client.cc',
+        'dbus/flimflam_ipconfig_client.h',
+        'dbus/flimflam_client_helper.cc',
+        'dbus/flimflam_client_helper.h',
+        'dbus/flimflam_network_client.cc',
+        'dbus/flimflam_network_client.h',
+        'dbus/flimflam_profile_client.cc',
+        'dbus/flimflam_profile_client.h',
+        'dbus/image_burner_client.cc',
+        'dbus/image_burner_client.h',
+        'dbus/introspectable_client.cc',
+        'dbus/introspectable_client.h',
+        'dbus/power_manager_client.cc',
+        'dbus/power_manager_client.h',
         'dbus/power_supply_status.cc',
         'dbus/power_supply_status.h',
+        'dbus/session_manager_client.cc',
+        'dbus/session_manager_client.h',
+        'dbus/speech_synthesizer_client.cc',
+        'dbus/speech_synthesizer_client.h',
+        'dbus/update_engine_client.cc',
+        'dbus/update_engine_client.h',
       ],
     },
-  ]
+    {
+      # This target contains mocks that can be used to write unit tests.
+      'target_name': 'chromeos_test_support',
+      'type': 'static_library',
+      'dependencies': [
+        '../build/linux/system.gyp:dbus',
+        '../testing/gmock.gyp:gmock',
+        'chromeos',
+      ],
+      'sources': [
+        'dbus/mock_bluetooth_adapter_client.cc',
+        'dbus/mock_bluetooth_adapter_client.h',
+        'dbus/mock_bluetooth_device_client.cc',
+        'dbus/mock_bluetooth_device_client.h',
+        'dbus/mock_bluetooth_input_client.cc',
+        'dbus/mock_bluetooth_input_client.h',
+        'dbus/mock_bluetooth_manager_client.cc',
+        'dbus/mock_bluetooth_manager_client.h',
+        'dbus/mock_bluetooth_node_client.cc',
+        'dbus/mock_bluetooth_node_client.h',
+        'dbus/mock_cros_disks_client.cc',
+        'dbus/mock_cros_disks_client.h',
+        'dbus/mock_cashew_client.cc',
+        'dbus/mock_cashew_client.h',
+        'dbus/mock_cryptohome_client.cc',
+        'dbus/mock_cryptohome_client.h',
+        'dbus/mock_dbus_thread_manager.cc',
+        'dbus/mock_dbus_thread_manager.h',
+        'dbus/mock_debug_daemon_client.cc',
+        'dbus/mock_debug_daemon_client.h',
+        'dbus/mock_flimflam_ipconfig_client.cc',
+        'dbus/mock_flimflam_ipconfig_client.h',
+        'dbus/mock_flimflam_network_client.cc',
+        'dbus/mock_flimflam_network_client.h',
+        'dbus/mock_flimflam_profile_client.cc',
+        'dbus/mock_flimflam_profile_client.h',
+        'dbus/mock_image_burner_client.cc',
+        'dbus/mock_image_burner_client.h',
+        'dbus/mock_introspectable_client.cc',
+        'dbus/mock_introspectable_client.h',
+        'dbus/mock_power_manager_client.cc',
+        'dbus/mock_power_manager_client.h',
+        'dbus/mock_session_manager_client.cc',
+        'dbus/mock_session_manager_client.h',
+        'dbus/mock_speech_synthesizer_client.cc',
+        'dbus/mock_speech_synthesizer_client.h',
+        'dbus/mock_update_engine_client.cc',
+        'dbus/mock_update_engine_client.h',
+      ],
+      'include_dirs': [
+        '..',
+      ],
+    },
+    {
+      'target_name': 'chromeos_unittests',
+      'type': 'executable',
+      'dependencies': [
+        '../base/base.gyp:run_all_unittests',
+        '../base/base.gyp:test_support_base',
+        '../build/linux/system.gyp:dbus',
+        '../dbus/dbus.gyp:dbus_test_support',
+        '../testing/gmock.gyp:gmock',
+        '../testing/gtest.gyp:gtest',
+        'chromeos_test_support',
+      ],
+      'sources': [
+        'dbus/blocking_method_caller_unittest.cc',
+        'dbus/flimflam_client_unittest_base.cc',
+        'dbus/flimflam_client_unittest_base.h',
+        'dbus/flimflam_network_client_unittest.cc',
+      ],
+      'include_dirs': [
+        '..',
+      ],
+    },
+    {
+      # Protobuf compiler / generator for the PowerSupplyProperties protocol
+      # buffer.
+      'target_name': 'power_state_control_proto',
+      'type': 'static_library',
+      'sources': [
+        '../third_party/cros_system_api/dbus/power_state_control.proto',
+      ],
+      'variables': {
+        'proto_in_dir': '../third_party/cros_system_api/dbus/',
+        'proto_out_dir': 'chromeos/dbus',
+      },
+      'includes': ['../build/protoc.gypi'],
+    },
+    {
+      # Protobuf compiler / generator for the PowerSupplyProperties protocol
+      # buffer.
+      'target_name': 'power_supply_properties_proto',
+      'type': 'static_library',
+      'sources': [
+        '../third_party/cros_system_api/dbus/power_supply_properties.proto',
+      ],
+      'variables': {
+        'proto_in_dir': '../third_party/cros_system_api/dbus/',
+        'proto_out_dir': 'chromeos/dbus',
+      },
+      'includes': ['../build/protoc.gypi'],
+    },
+  ],
 }
diff --git a/chromeos/dbus/DEPS b/chromeos/dbus/DEPS
new file mode 100644
index 0000000..d6abdda
--- /dev/null
+++ b/chromeos/dbus/DEPS
@@ -0,0 +1,3 @@
+include_rules = [
+  "+dbus",
+]
diff --git a/chrome/browser/chromeos/dbus/blocking_method_caller.cc b/chromeos/dbus/blocking_method_caller.cc
index d59ef9c..182f0cf 100644
--- a/chrome/browser/chromeos/dbus/blocking_method_caller.cc
+++ b/chromeos/dbus/blocking_method_caller.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/blocking_method_caller.h"
+#include "chromeos/dbus/blocking_method_caller.h"
 
 #include "base/bind.h"
 #include "dbus/bus.h"
diff --git a/chrome/browser/chromeos/dbus/blocking_method_caller.h b/chromeos/dbus/blocking_method_caller.h
index 8e67a68..48d21cf 100644
--- a/chrome/browser/chromeos/dbus/blocking_method_caller.h
+++ b/chromeos/dbus/blocking_method_caller.h
@@ -2,12 +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_BLOCKING_METHOD_CALLER_H_
-#define CHROME_BROWSER_CHROMEOS_DBUS_BLOCKING_METHOD_CALLER_H_
+#ifndef CHROMEOS_DBUS_BLOCKING_METHOD_CALLER_H_
+#define CHROMEOS_DBUS_BLOCKING_METHOD_CALLER_H_
 #pragma once
 
 #include "base/callback.h"
 #include "base/synchronization/waitable_event.h"
+#include "chromeos/chromeos_export.h"
 
 namespace dbus {
 
@@ -23,7 +24,7 @@ namespace chromeos {
 // A utility class to call D-Bus methods in a synchronous (blocking) way.
 // Note: Blocking the thread until it returns is not a good idea in most cases.
 //       Avoid using this class as hard as you can.
-class BlockingMethodCaller {
+class CHROMEOS_EXPORT BlockingMethodCaller {
  public:
   BlockingMethodCaller(dbus::Bus* bus, dbus::ObjectProxy* proxy);
   virtual ~BlockingMethodCaller();
@@ -42,4 +43,4 @@ class BlockingMethodCaller {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_DBUS_BLOCKING_METHOD_CALLER_H_
+#endif  // CHROMEOS_DBUS_BLOCKING_METHOD_CALLER_H_
diff --git a/chrome/browser/chromeos/dbus/blocking_method_caller_unittest.cc b/chromeos/dbus/blocking_method_caller_unittest.cc
index 4646cdc..eb2394a 100644
--- a/chrome/browser/chromeos/dbus/blocking_method_caller_unittest.cc
+++ b/chromeos/dbus/blocking_method_caller_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/blocking_method_caller.h"
+#include "chromeos/dbus/blocking_method_caller.h"
 
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
diff --git a/chrome/browser/chromeos/dbus/bluetooth_adapter_client.cc b/chromeos/dbus/bluetooth_adapter_client.cc
index d030a92..566d470 100644
--- a/chrome/browser/chromeos/dbus/bluetooth_adapter_client.cc
+++ b/chromeos/dbus/bluetooth_adapter_client.cc
@@ -2,16 +2,16 @@
 // 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/bluetooth_adapter_client.h"
+#include "chromeos/dbus/bluetooth_adapter_client.h"
 
 #include <map>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
-#include "chrome/browser/chromeos/dbus/bluetooth_device_client.h"
-#include "chrome/browser/chromeos/dbus/bluetooth_manager_client.h"
-#include "chrome/browser/chromeos/dbus/bluetooth_property.h"
+#include "chromeos/dbus/bluetooth_device_client.h"
+#include "chromeos/dbus/bluetooth_manager_client.h"
+#include "chromeos/dbus/bluetooth_property.h"
 #include "dbus/bus.h"
 #include "dbus/message.h"
 #include "dbus/object_path.h"
diff --git a/chrome/browser/chromeos/dbus/bluetooth_adapter_client.h b/chromeos/dbus/bluetooth_adapter_client.h
index 846a5dd..6e59429 100644
--- a/chrome/browser/chromeos/dbus/bluetooth_adapter_client.h
+++ b/chromeos/dbus/bluetooth_adapter_client.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_BLUETOOTH_ADAPTER_CLIENT_H_
-#define CHROME_BROWSER_CHROMEOS_DBUS_BLUETOOTH_ADAPTER_CLIENT_H_
+#ifndef CHROMEOS_DBUS_BLUETOOTH_ADAPTER_CLIENT_H_
+#define CHROMEOS_DBUS_BLUETOOTH_ADAPTER_CLIENT_H_
 #pragma once
 
 #include <string>
@@ -12,9 +12,10 @@
 #include "base/callback.h"
 #include "base/observer_list.h"
 #include "base/values.h"
-#include "chrome/browser/chromeos/dbus/bluetooth_device_client.h"
-#include "chrome/browser/chromeos/dbus/bluetooth_property.h"
-#include "chrome/browser/chromeos/dbus/dbus_client_implementation_type.h"
+#include "chromeos/chromeos_export.h"
+#include "chromeos/dbus/bluetooth_device_client.h"
+#include "chromeos/dbus/bluetooth_property.h"
+#include "chromeos/dbus/dbus_client_implementation_type.h"
 #include "dbus/object_path.h"
 
 namespace dbus {
@@ -27,7 +28,7 @@ class BluetoothManagerClient;
 
 // BluetoothAdapterClient is used to communicate with a bluetooth Adapter
 // interface.
-class BluetoothAdapterClient {
+class CHROMEOS_EXPORT BluetoothAdapterClient {
  public:
   // Structure of properties associated with bluetooth adapters.
   struct Properties : public BluetoothPropertySet {
@@ -240,4 +241,4 @@ class BluetoothAdapterClient {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_DBUS_BLUETOOTH_ADAPTER_CLIENT_H_
+#endif  // CHROMEOS_DBUS_BLUETOOTH_ADAPTER_CLIENT_H_
diff --git a/chrome/browser/chromeos/dbus/bluetooth_agent_service_provider.cc b/chromeos/dbus/bluetooth_agent_service_provider.cc
index f686097..aea7291 100644
--- a/chrome/browser/chromeos/dbus/bluetooth_agent_service_provider.cc
+++ b/chromeos/dbus/bluetooth_agent_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/bluetooth_agent_service_provider.h"
+#include "chromeos/dbus/bluetooth_agent_service_provider.h"
 
 #include <string>
 
diff --git a/chrome/browser/chromeos/dbus/bluetooth_agent_service_provider.h b/chromeos/dbus/bluetooth_agent_service_provider.h
index 417f6bf..8e4178c 100644
--- a/chrome/browser/chromeos/dbus/bluetooth_agent_service_provider.h
+++ b/chromeos/dbus/bluetooth_agent_service_provider.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_BLUETOOTH_AGENT_SERVICE_PROVIDER_H_
-#define CHROME_BROWSER_CHROMEOS_DBUS_BLUETOOTH_AGENT_SERVICE_PROVIDER_H_
+#ifndef CHROMEOS_DBUS_BLUETOOTH_AGENT_SERVICE_PROVIDER_H_
+#define CHROMEOS_DBUS_BLUETOOTH_AGENT_SERVICE_PROVIDER_H_
 #pragma once
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
+#include "chromeos/chromeos_export.h"
 #include "dbus/bus.h"
 #include "dbus/object_path.h"
 
@@ -24,7 +25,7 @@ namespace chromeos {
 // to the agent by the Bluetooth daemon will be passed on to your Delegate
 // object for handling, and responses returned using the callbacks supplied
 // to those methods.
-class BluetoothAgentServiceProvider {
+class CHROMEOS_EXPORT BluetoothAgentServiceProvider {
  public:
   // Interface for reacting to agent requests.
   class Delegate {
@@ -175,4 +176,4 @@ class BluetoothAgentServiceProvider {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_DBUS_BLUETOOTH_AGENT_SERVICE_PROVIDER_H_
+#endif  // CHROMEOS_DBUS_BLUETOOTH_AGENT_SERVICE_PROVIDER_H_
diff --git a/chrome/browser/chromeos/dbus/bluetooth_device_client.cc b/chromeos/dbus/bluetooth_device_client.cc
index 18942f4..a4ce54b4 100644
--- a/chrome/browser/chromeos/dbus/bluetooth_device_client.cc
+++ b/chromeos/dbus/bluetooth_device_client.cc
@@ -2,15 +2,15 @@
 // 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/bluetooth_device_client.h"
+#include "chromeos/dbus/bluetooth_device_client.h"
 
 #include <map>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
-#include "chrome/browser/chromeos/dbus/bluetooth_adapter_client.h"
-#include "chrome/browser/chromeos/dbus/bluetooth_property.h"
+#include "chromeos/dbus/bluetooth_adapter_client.h"
+#include "chromeos/dbus/bluetooth_property.h"
 #include "dbus/bus.h"
 #include "dbus/message.h"
 #include "dbus/object_path.h"
diff --git a/chrome/browser/chromeos/dbus/bluetooth_device_client.h b/chromeos/dbus/bluetooth_device_client.h
index ea7d367..cc82126 100644
--- a/chrome/browser/chromeos/dbus/bluetooth_device_client.h
+++ b/chromeos/dbus/bluetooth_device_client.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_BLUETOOTH_DEVICE_CLIENT_H_
-#define CHROME_BROWSER_CHROMEOS_DBUS_BLUETOOTH_DEVICE_CLIENT_H_
+#ifndef CHROMEOS_DBUS_BLUETOOTH_DEVICE_CLIENT_H_
+#define CHROMEOS_DBUS_BLUETOOTH_DEVICE_CLIENT_H_
 #pragma once
 
 #include <map>
@@ -13,8 +13,9 @@
 #include "base/callback.h"
 #include "base/observer_list.h"
 #include "base/values.h"
-#include "chrome/browser/chromeos/dbus/bluetooth_property.h"
-#include "chrome/browser/chromeos/dbus/dbus_client_implementation_type.h"
+#include "chromeos/chromeos_export.h"
+#include "chromeos/dbus/bluetooth_property.h"
+#include "chromeos/dbus/dbus_client_implementation_type.h"
 #include "dbus/object_path.h"
 
 namespace dbus {
@@ -27,7 +28,7 @@ class BluetoothAdapterClient;
 
 // BluetoothDeviceClient is used to communicate with a bluetooth Device
 // interface.
-class BluetoothDeviceClient {
+class CHROMEOS_EXPORT BluetoothDeviceClient {
  public:
   // Structure of properties associated with bluetooth devices.
   struct Properties : public BluetoothPropertySet {
@@ -208,4 +209,4 @@ class BluetoothDeviceClient {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_DBUS_BLUETOOTH_DEVICE_CLIENT_H_
+#endif  // CHROMEOS_DBUS_BLUETOOTH_DEVICE_CLIENT_H_
diff --git a/chrome/browser/chromeos/dbus/bluetooth_input_client.cc b/chromeos/dbus/bluetooth_input_client.cc
index 88b5a8d..6e9b890 100644
--- a/chrome/browser/chromeos/dbus/bluetooth_input_client.cc
+++ b/chromeos/dbus/bluetooth_input_client.cc
@@ -2,15 +2,15 @@
 // 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/bluetooth_input_client.h"
+#include "chromeos/dbus/bluetooth_input_client.h"
 
 #include <map>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
-#include "chrome/browser/chromeos/dbus/bluetooth_adapter_client.h"
-#include "chrome/browser/chromeos/dbus/bluetooth_property.h"
+#include "chromeos/dbus/bluetooth_adapter_client.h"
+#include "chromeos/dbus/bluetooth_property.h"
 #include "dbus/bus.h"
 #include "dbus/message.h"
 #include "dbus/object_path.h"
diff --git a/chrome/browser/chromeos/dbus/bluetooth_input_client.h b/chromeos/dbus/bluetooth_input_client.h
index bfa45dc..2c1e015 100644
--- a/chrome/browser/chromeos/dbus/bluetooth_input_client.h
+++ b/chromeos/dbus/bluetooth_input_client.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_BLUETOOTH_INPUT_CLIENT_H_
-#define CHROME_BROWSER_CHROMEOS_DBUS_BLUETOOTH_INPUT_CLIENT_H_
+#ifndef CHROMEOS_DBUS_BLUETOOTH_INPUT_CLIENT_H_
+#define CHROMEOS_DBUS_BLUETOOTH_INPUT_CLIENT_H_
 #pragma once
 
 #include <string>
@@ -11,8 +11,9 @@
 #include "base/callback.h"
 #include "base/observer_list.h"
 #include "base/values.h"
-#include "chrome/browser/chromeos/dbus/bluetooth_property.h"
-#include "chrome/browser/chromeos/dbus/dbus_client_implementation_type.h"
+#include "chromeos/chromeos_export.h"
+#include "chromeos/dbus/bluetooth_property.h"
+#include "chromeos/dbus/dbus_client_implementation_type.h"
 #include "dbus/object_path.h"
 
 namespace dbus {
@@ -27,7 +28,7 @@ class BluetoothAdapterClient;
 // of a bluetooth device, rather than the generic device interface. Input
 // devices are those conforming to the Bluetooth SIG HID (Human Interface
 // Device) Profile such as keyboards, mice, trackpads and joysticks.
-class BluetoothInputClient {
+class CHROMEOS_EXPORT BluetoothInputClient {
  public:
   // Structure of properties associated with bluetooth input devices.
   struct Properties : public BluetoothPropertySet {
@@ -92,4 +93,4 @@ class BluetoothInputClient {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_DBUS_BLUETOOTH_INPUT_CLIENT_H_
+#endif  // CHROMEOS_DBUS_BLUETOOTH_INPUT_CLIENT_H_
diff --git a/chrome/browser/chromeos/dbus/bluetooth_manager_client.cc b/chromeos/dbus/bluetooth_manager_client.cc
index e75119e..1ff3f62 100644
--- a/chrome/browser/chromeos/dbus/bluetooth_manager_client.cc
+++ b/chromeos/dbus/bluetooth_manager_client.cc
@@ -2,11 +2,11 @@
 // 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/bluetooth_manager_client.h"
+#include "chromeos/dbus/bluetooth_manager_client.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
-#include "chrome/browser/chromeos/dbus/bluetooth_property.h"
+#include "chromeos/dbus/bluetooth_property.h"
 #include "dbus/bus.h"
 #include "dbus/message.h"
 #include "dbus/object_path.h"
diff --git a/chrome/browser/chromeos/dbus/bluetooth_manager_client.h b/chromeos/dbus/bluetooth_manager_client.h
index 777f6cc..13d7599 100644
--- a/chrome/browser/chromeos/dbus/bluetooth_manager_client.h
+++ b/chromeos/dbus/bluetooth_manager_client.h
@@ -2,16 +2,17 @@
 // 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_BLUETOOTH_MANAGER_CLIENT_H_
-#define CHROME_BROWSER_CHROMEOS_DBUS_BLUETOOTH_MANAGER_CLIENT_H_
+#ifndef CHROMEOS_DBUS_BLUETOOTH_MANAGER_CLIENT_H_
+#define CHROMEOS_DBUS_BLUETOOTH_MANAGER_CLIENT_H_
 #pragma once
 
 #include <string>
 
 #include "base/callback.h"
 #include "base/observer_list.h"
-#include "chrome/browser/chromeos/dbus/bluetooth_property.h"
-#include "chrome/browser/chromeos/dbus/dbus_client_implementation_type.h"
+#include "chromeos/chromeos_export.h"
+#include "chromeos/dbus/bluetooth_property.h"
+#include "chromeos/dbus/dbus_client_implementation_type.h"
 #include "dbus/object_path.h"
 
 namespace dbus {
@@ -22,7 +23,7 @@ namespace chromeos {
 
 // BluetoothManagerClient is used to communicate with the bluetooth
 // daemon's Manager interface.
-class BluetoothManagerClient {
+class CHROMEOS_EXPORT BluetoothManagerClient {
  public:
   // Structure of properties associated with the bluetooth manager.
   struct Properties : public BluetoothPropertySet {
@@ -96,4 +97,4 @@ class BluetoothManagerClient {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_DBUS_BLUETOOTH_MANAGER_CLIENT_H_
+#endif  // CHROMEOS_DBUS_BLUETOOTH_MANAGER_CLIENT_H_
diff --git a/chrome/browser/chromeos/dbus/bluetooth_node_client.cc b/chromeos/dbus/bluetooth_node_client.cc
index 34e62cd..52959cf 100644
--- a/chrome/browser/chromeos/dbus/bluetooth_node_client.cc
+++ b/chromeos/dbus/bluetooth_node_client.cc
@@ -2,15 +2,15 @@
 // 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/bluetooth_node_client.h"
+#include "chromeos/dbus/bluetooth_node_client.h"
 
 #include <map>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
-#include "chrome/browser/chromeos/dbus/bluetooth_device_client.h"
-#include "chrome/browser/chromeos/dbus/bluetooth_property.h"
+#include "chromeos/dbus/bluetooth_device_client.h"
+#include "chromeos/dbus/bluetooth_property.h"
 #include "dbus/bus.h"
 #include "dbus/message.h"
 #include "dbus/object_path.h"
diff --git a/chrome/browser/chromeos/dbus/bluetooth_node_client.h b/chromeos/dbus/bluetooth_node_client.h
index dbe3ab3..f99d17f 100644
--- a/chrome/browser/chromeos/dbus/bluetooth_node_client.h
+++ b/chromeos/dbus/bluetooth_node_client.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_BLUETOOTH_NODE_CLIENT_H_
-#define CHROME_BROWSER_CHROMEOS_DBUS_BLUETOOTH_NODE_CLIENT_H_
+#ifndef CHROMEOS_DBUS_BLUETOOTH_NODE_CLIENT_H_
+#define CHROMEOS_DBUS_BLUETOOTH_NODE_CLIENT_H_
 #pragma once
 
 #include <string>
@@ -11,8 +11,9 @@
 #include "base/callback.h"
 #include "base/observer_list.h"
 #include "base/values.h"
-#include "chrome/browser/chromeos/dbus/bluetooth_property.h"
-#include "chrome/browser/chromeos/dbus/dbus_client_implementation_type.h"
+#include "chromeos/chromeos_export.h"
+#include "chromeos/dbus/bluetooth_property.h"
+#include "chromeos/dbus/dbus_client_implementation_type.h"
 #include "dbus/object_path.h"
 
 namespace dbus {
@@ -26,7 +27,7 @@ class BluetoothDeviceClient;
 // BluetoothNodeClient is used to represent persistent device nodes
 // bound to bluetooth devices, such as RFCOMM TTY bindings to ttyX devices
 // in Linux.
-class BluetoothNodeClient {
+class CHROMEOS_EXPORT BluetoothNodeClient {
  public:
   // Structure of properties associated with persistent device nodes.
   struct Properties : public BluetoothPropertySet {
@@ -78,4 +79,4 @@ class BluetoothNodeClient {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_DBUS_BLUETOOTH_NODE_CLIENT_H_
+#endif  // CHROMEOS_DBUS_BLUETOOTH_NODE_CLIENT_H_
diff --git a/chrome/browser/chromeos/dbus/bluetooth_property.cc b/chromeos/dbus/bluetooth_property.cc
index 5041fd8..24a1958 100644
--- a/chrome/browser/chromeos/dbus/bluetooth_property.cc
+++ b/chromeos/dbus/bluetooth_property.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/bluetooth_property.h"
+#include "chromeos/dbus/bluetooth_property.h"
 
 #include "base/bind.h"
 #include "dbus/message.h"
diff --git a/chrome/browser/chromeos/dbus/bluetooth_property.h b/chromeos/dbus/bluetooth_property.h
index eb1f69d..ccfbff1 100644
--- a/chrome/browser/chromeos/dbus/bluetooth_property.h
+++ b/chromeos/dbus/bluetooth_property.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_BLUETOOTH_PROPERTY_H_
-#define CHROME_BROWSER_CHROMEOS_DBUS_BLUETOOTH_PROPERTY_H_
+#ifndef CHROMEOS_DBUS_BLUETOOTH_PROPERTY_H_
+#define CHROMEOS_DBUS_BLUETOOTH_PROPERTY_H_
 #pragma once
 
 #include "base/compiler_specific.h"
@@ -93,4 +93,4 @@ class BluetoothProperty : public dbus::Property<T> {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_DBUS_BLUETOOTH_PROPERTY_H_
+#endif  // CHROMEOS_DBUS_BLUETOOTH_PROPERTY_H_
diff --git a/chrome/browser/chromeos/dbus/cashew_client.cc b/chromeos/dbus/cashew_client.cc
index b4bb4df..93d1f3d 100644
--- a/chrome/browser/chromeos/dbus/cashew_client.cc
+++ b/chromeos/dbus/cashew_client.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/cashew_client.h"
+#include "chromeos/dbus/cashew_client.h"
 
 #include "base/bind.h"
 #include "base/values.h"
diff --git a/chrome/browser/chromeos/dbus/cashew_client.h b/chromeos/dbus/cashew_client.h
index 8f10a03b..2238e1b 100644
--- a/chrome/browser/chromeos/dbus/cashew_client.h
+++ b/chromeos/dbus/cashew_client.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_CASHEW_CLIENT_H_
-#define CHROME_BROWSER_CHROMEOS_DBUS_CASHEW_CLIENT_H_
+#ifndef CHROMEOS_DBUS_CASHEW_CLIENT_H_
+#define CHROMEOS_DBUS_CASHEW_CLIENT_H_
 #pragma once
 
 #include <string>
@@ -11,7 +11,8 @@
 
 #include "base/basictypes.h"
 #include "base/callback.h"
-#include "chrome/browser/chromeos/dbus/dbus_client_implementation_type.h"
+#include "chromeos/chromeos_export.h"
+#include "chromeos/dbus/dbus_client_implementation_type.h"
 
 namespace base {
 class ListValue;
@@ -26,7 +27,7 @@ namespace chromeos {
 // CashewClient is used to communicate with the Cashew service.
 // All methods should be called from the origin thread (UI thread) which
 // initializes the DBusThreadManager instance.
-class CashewClient {
+class CHROMEOS_EXPORT CashewClient {
  public:
   // A callback to handle "DataPlansUpdate" signal.
   // |service| is the D-Bus path of the cellular service.
@@ -61,4 +62,4 @@ class CashewClient {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_DBUS_CASHEW_CLIENT_H_
+#endif  // CHROMEOS_DBUS_CASHEW_CLIENT_H_
diff --git a/chrome/browser/chromeos/dbus/cros_disks_client.cc b/chromeos/dbus/cros_disks_client.cc
index 729c345..217382c 100644
--- a/chrome/browser/chromeos/dbus/cros_disks_client.cc
+++ b/chromeos/dbus/cros_disks_client.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_disks_client.h"
+#include "chromeos/dbus/cros_disks_client.h"
 
 #include "base/bind.h"
 #include "base/stl_util.h"
diff --git a/chrome/browser/chromeos/dbus/cros_disks_client.h b/chromeos/dbus/cros_disks_client.h
index a82427a..df7cf49 100644
--- a/chrome/browser/chromeos/dbus/cros_disks_client.h
+++ b/chromeos/dbus/cros_disks_client.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_CROS_DISKS_CLIENT_H_
-#define CHROME_BROWSER_CHROMEOS_DBUS_CROS_DISKS_CLIENT_H_
+#ifndef CHROMEOS_DBUS_CROS_DISKS_CLIENT_H_
+#define CHROMEOS_DBUS_CROS_DISKS_CLIENT_H_
 #pragma once
 
 #include <string>
@@ -11,7 +11,8 @@
 
 #include "base/basictypes.h"
 #include "base/callback.h"
-#include "chrome/browser/chromeos/dbus/dbus_client_implementation_type.h"
+#include "chromeos/chromeos_export.h"
+#include "chromeos/dbus/dbus_client_implementation_type.h"
 
 namespace dbus {
 class Bus;
@@ -133,7 +134,7 @@ class DiskInfo {
 // A class to make the actual DBus calls for cros-disks service.
 // This class only makes calls, result/error handling should be done
 // by callbacks.
-class CrosDisksClient {
+class CHROMEOS_EXPORT CrosDisksClient {
  public:
   // A callback to be called when DBus method call fails.
   typedef base::Callback<void()> ErrorCallback;
@@ -229,4 +230,4 @@ class CrosDisksClient {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_DBUS_CROS_DISKS_CLIENT_H_
+#endif  // CHROMEOS_DBUS_CROS_DISKS_CLIENT_H_
diff --git a/chrome/browser/chromeos/dbus/cryptohome_client.cc b/chromeos/dbus/cryptohome_client.cc
index 57674be0..b4d9e3f 100644
--- a/chrome/browser/chromeos/dbus/cryptohome_client.cc
+++ b/chromeos/dbus/cryptohome_client.cc
@@ -2,11 +2,11 @@
 // 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/cryptohome_client.h"
+#include "chromeos/dbus/cryptohome_client.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
-#include "chrome/browser/chromeos/dbus/blocking_method_caller.h"
+#include "chromeos/dbus/blocking_method_caller.h"
 #include "dbus/bus.h"
 #include "dbus/message.h"
 #include "dbus/object_path.h"
diff --git a/chrome/browser/chromeos/dbus/cryptohome_client.h b/chromeos/dbus/cryptohome_client.h
index 1b80feb..df93832 100644
--- a/chrome/browser/chromeos/dbus/cryptohome_client.h
+++ b/chromeos/dbus/cryptohome_client.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_CRYPTOHOME_CLIENT_H_
-#define CHROME_BROWSER_CHROMEOS_DBUS_CRYPTOHOME_CLIENT_H_
+#ifndef CHROMEOS_DBUS_CRYPTOHOME_CLIENT_H_
+#define CHROMEOS_DBUS_CRYPTOHOME_CLIENT_H_
 #pragma once
 
 #include <string>
@@ -11,8 +11,9 @@
 
 #include "base/basictypes.h"
 #include "base/callback.h"
-#include "chrome/browser/chromeos/dbus/dbus_client_implementation_type.h"
-#include "chrome/browser/chromeos/dbus/dbus_method_call_status.h"
+#include "chromeos/chromeos_export.h"
+#include "chromeos/dbus/dbus_client_implementation_type.h"
+#include "chromeos/dbus/dbus_method_call_status.h"
 
 namespace dbus {
 class Bus;
@@ -23,7 +24,7 @@ namespace chromeos {
 // CryptohomeClient is used to communicate with the Cryptohome service.
 // All method should be called from the origin thread (UI thread) which
 // initializes the DBusThreadManager instance.
-class CryptohomeClient {
+class CHROMEOS_EXPORT CryptohomeClient {
  public:
   // A callback to handle AsyncCallStatus signals.
   typedef base::Callback<void(int async_id, bool return_status, int return_code)
@@ -175,4 +176,4 @@ class CryptohomeClient {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_DBUS_CRYPTOHOME_CLIENT_H_
+#endif  // CHROMEOS_DBUS_CRYPTOHOME_CLIENT_H_
diff --git a/chrome/browser/chromeos/dbus/dbus_client_implementation_type.h b/chromeos/dbus/dbus_client_implementation_type.h
index 2ed432d..45fb492 100644
--- a/chrome/browser/chromeos/dbus/dbus_client_implementation_type.h
+++ b/chromeos/dbus/dbus_client_implementation_type.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_DBUS_CLIENT_IMPLEMENTATION_TYPE_H_
-#define CHROME_BROWSER_CHROMEOS_DBUS_DBUS_CLIENT_IMPLEMENTATION_TYPE_H_
+#ifndef CHROMEOS_DBUS_DBUS_CLIENT_IMPLEMENTATION_TYPE_H_
+#define CHROMEOS_DBUS_DBUS_CLIENT_IMPLEMENTATION_TYPE_H_
 
 namespace chromeos {
 
@@ -15,4 +15,4 @@ enum DBusClientImplementationType {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_DBUS_DBUS_CLIENT_IMPLEMENTATION_TYPE_H_
+#endif  // CHROMEOS_DBUS_DBUS_CLIENT_IMPLEMENTATION_TYPE_H_
diff --git a/chrome/browser/chromeos/dbus/dbus_method_call_status.h b/chromeos/dbus/dbus_method_call_status.h
index 6206f23..6cfb11e 100644
--- a/chrome/browser/chromeos/dbus/dbus_method_call_status.h
+++ b/chromeos/dbus/dbus_method_call_status.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_DBUS_METHOD_CALL_STATUS_H_
-#define CHROME_BROWSER_CHROMEOS_DBUS_DBUS_METHOD_CALL_STATUS_H_
+#ifndef CHROMEOS_DBUS_DBUS_METHOD_CALL_STATUS_H_
+#define CHROMEOS_DBUS_DBUS_METHOD_CALL_STATUS_H_
 
 namespace chromeos {
 
@@ -15,4 +15,4 @@ enum DBusMethodCallStatus {
 
 }  // namespace
 
-#endif  // CHROME_BROWSER_CHROMEOS_DBUS_DBUS_METHOD_CALL_STATUS_H_
+#endif  // CHROMEOS_DBUS_DBUS_METHOD_CALL_STATUS_H_
diff --git a/chrome/browser/chromeos/dbus/dbus_thread_manager.cc b/chromeos/dbus/dbus_thread_manager.cc
index 9cbd6ab..79ba37d 100644
--- a/chrome/browser/chromeos/dbus/dbus_thread_manager.cc
+++ b/chromeos/dbus/dbus_thread_manager.cc
@@ -2,29 +2,29 @@
 // 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/dbus_thread_manager.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
 
 #include "base/chromeos/chromeos_version.h"
 #include "base/threading/thread.h"
-#include "chrome/browser/chromeos/dbus/bluetooth_adapter_client.h"
-#include "chrome/browser/chromeos/dbus/bluetooth_device_client.h"
-#include "chrome/browser/chromeos/dbus/bluetooth_input_client.h"
-#include "chrome/browser/chromeos/dbus/bluetooth_manager_client.h"
-#include "chrome/browser/chromeos/dbus/bluetooth_node_client.h"
-#include "chrome/browser/chromeos/dbus/cashew_client.h"
-#include "chrome/browser/chromeos/dbus/dbus_client_implementation_type.h"
-#include "chrome/browser/chromeos/dbus/cros_disks_client.h"
-#include "chrome/browser/chromeos/dbus/cryptohome_client.h"
-#include "chrome/browser/chromeos/dbus/debug_daemon_client.h"
-#include "chrome/browser/chromeos/dbus/flimflam_ipconfig_client.h"
-#include "chrome/browser/chromeos/dbus/flimflam_network_client.h"
-#include "chrome/browser/chromeos/dbus/flimflam_profile_client.h"
-#include "chrome/browser/chromeos/dbus/image_burner_client.h"
-#include "chrome/browser/chromeos/dbus/introspectable_client.h"
-#include "chrome/browser/chromeos/dbus/power_manager_client.h"
-#include "chrome/browser/chromeos/dbus/session_manager_client.h"
-#include "chrome/browser/chromeos/dbus/speech_synthesizer_client.h"
-#include "chrome/browser/chromeos/dbus/update_engine_client.h"
+#include "chromeos/dbus/bluetooth_adapter_client.h"
+#include "chromeos/dbus/bluetooth_device_client.h"
+#include "chromeos/dbus/bluetooth_input_client.h"
+#include "chromeos/dbus/bluetooth_manager_client.h"
+#include "chromeos/dbus/bluetooth_node_client.h"
+#include "chromeos/dbus/cashew_client.h"
+#include "chromeos/dbus/cros_disks_client.h"
+#include "chromeos/dbus/cryptohome_client.h"
+#include "chromeos/dbus/dbus_client_implementation_type.h"
+#include "chromeos/dbus/debug_daemon_client.h"
+#include "chromeos/dbus/flimflam_ipconfig_client.h"
+#include "chromeos/dbus/flimflam_network_client.h"
+#include "chromeos/dbus/flimflam_profile_client.h"
+#include "chromeos/dbus/image_burner_client.h"
+#include "chromeos/dbus/introspectable_client.h"
+#include "chromeos/dbus/power_manager_client.h"
+#include "chromeos/dbus/session_manager_client.h"
+#include "chromeos/dbus/speech_synthesizer_client.h"
+#include "chromeos/dbus/update_engine_client.h"
 #include "dbus/bus.h"
 
 namespace chromeos {
diff --git a/chrome/browser/chromeos/dbus/dbus_thread_manager.h b/chromeos/dbus/dbus_thread_manager.h
index f2caffa..2e413540 100644
--- a/chrome/browser/chromeos/dbus/dbus_thread_manager.h
+++ b/chromeos/dbus/dbus_thread_manager.h
@@ -2,12 +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_DBUS_THREAD_MANAGER_H_
-#define CHROME_BROWSER_CHROMEOS_DBUS_DBUS_THREAD_MANAGER_H_
+#ifndef CHROMEOS_DBUS_DBUS_THREAD_MANAGER_H_
+#define CHROMEOS_DBUS_DBUS_THREAD_MANAGER_H_
 #pragma once
 
-#include "base/memory/scoped_ptr.h"
 #include "base/memory/ref_counted.h"
+#include "base/memory/scoped_ptr.h"
+#include "chromeos/chromeos_export.h"
 
 namespace base {
 class Thread;
@@ -57,7 +58,7 @@ class UpdateEngineClient;
 // WeakPtrFactory when creating callbacks that run on UI thread. See
 // session_manager_client.cc for examples.
 //
-class DBusThreadManager {
+class CHROMEOS_EXPORT DBusThreadManager {
  public:
   // Sets the global instance. Must be called before any calls to Get().
   // We explicitly initialize and shut down the global object, rather than
@@ -177,4 +178,4 @@ class DBusThreadManager {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_DBUS_DBUS_THREAD_MANAGER_H_
+#endif  // CHROMEOS_DBUS_DBUS_THREAD_MANAGER_H_
diff --git a/chrome/browser/chromeos/dbus/debug_daemon_client.cc b/chromeos/dbus/debug_daemon_client.cc
index c9c5822..bc8e06d 100644
--- a/chrome/browser/chromeos/dbus/debug_daemon_client.cc
+++ b/chromeos/dbus/debug_daemon_client.cc
@@ -5,7 +5,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include "chrome/browser/chromeos/dbus/debug_daemon_client.h"
+#include "chromeos/dbus/debug_daemon_client.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ -14,7 +14,6 @@
 #include "base/memory/ref_counted_memory.h"
 #include "base/platform_file.h"
 #include "base/string_util.h"
-#include "content/public/browser/browser_thread.h"
 #include "dbus/bus.h"
 #include "dbus/message.h"
 #include "dbus/object_path.h"
@@ -24,8 +23,6 @@
 #include "net/base/net_errors.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
-using content::BrowserThread;
-
 namespace {
 
 // Used in DebugDaemonClient::EmptySystemStopTracingCallback().
diff --git a/chrome/browser/chromeos/dbus/debug_daemon_client.h b/chromeos/dbus/debug_daemon_client.h
index 843a059..38e4015 100644
--- a/chrome/browser/chromeos/dbus/debug_daemon_client.h
+++ b/chromeos/dbus/debug_daemon_client.h
@@ -2,12 +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_DEBUG_DAEMON_CLIENT_H_
-#define CHROME_BROWSER_CHROMEOS_DBUS_DEBUG_DAEMON_CLIENT_H_
+#ifndef CHROMEOS_DBUS_DEBUG_DAEMON_CLIENT_H_
+#define CHROMEOS_DBUS_DEBUG_DAEMON_CLIENT_H_
 
 #include "base/callback.h"
 #include "base/memory/ref_counted_memory.h"
-#include "chrome/browser/chromeos/dbus/dbus_client_implementation_type.h"
+#include "chromeos/chromeos_export.h"
+#include "chromeos/dbus/dbus_client_implementation_type.h"
 
 namespace dbus {
 class Bus;
@@ -16,7 +17,7 @@ class Bus;
 namespace chromeos {
 
 // DebugDaemonClient is used to communicate with the debug daemon.
-class DebugDaemonClient {
+class CHROMEOS_EXPORT DebugDaemonClient {
  public:
   virtual ~DebugDaemonClient();
 
@@ -49,4 +50,4 @@ class DebugDaemonClient {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_DBUS_DEBUG_DAEMON_CLIENT_H_
+#endif  // CHROMEOS_DBUS_DEBUG_DAEMON_CLIENT_H_
diff --git a/chrome/browser/chromeos/dbus/flimflam_client_helper.cc b/chromeos/dbus/flimflam_client_helper.cc
index a3a6a2c..0d5c754 100644
--- a/chrome/browser/chromeos/dbus/flimflam_client_helper.cc
+++ b/chromeos/dbus/flimflam_client_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/flimflam_client_helper.h"
+#include "chromeos/dbus/flimflam_client_helper.h"
 
 #include "base/bind.h"
 #include "base/values.h"
diff --git a/chrome/browser/chromeos/dbus/flimflam_client_helper.h b/chromeos/dbus/flimflam_client_helper.h
index 289da12..bfe4612 100644
--- a/chrome/browser/chromeos/dbus/flimflam_client_helper.h
+++ b/chromeos/dbus/flimflam_client_helper.h
@@ -2,15 +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_FLIMFLAM_CLIENT_HELPER_H_
-#define CHROME_BROWSER_CHROMEOS_DBUS_FLIMFLAM_CLIENT_HELPER_H_
+#ifndef CHROMEOS_DBUS_FLIMFLAM_CLIENT_HELPER_H_
+#define CHROMEOS_DBUS_FLIMFLAM_CLIENT_HELPER_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/memory/weak_ptr.h"
-#include "chrome/browser/chromeos/dbus/dbus_method_call_status.h"
+#include "chromeos/dbus/dbus_method_call_status.h"
 
 namespace base {
 
@@ -91,4 +91,4 @@ class FlimflamClientHelper {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_DBUS_FLIMFLAM_CLIENT_HELPER_H_
+#endif  // CHROMEOS_DBUS_FLIMFLAM_CLIENT_HELPER_H_
diff --git a/chrome/browser/chromeos/dbus/flimflam_client_unittest_base.cc b/chromeos/dbus/flimflam_client_unittest_base.cc
index 981ded3..d9591f8 100644
--- a/chrome/browser/chromeos/dbus/flimflam_client_unittest_base.cc
+++ b/chromeos/dbus/flimflam_client_unittest_base.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/flimflam_client_unittest_base.h"
+#include "chromeos/dbus/flimflam_client_unittest_base.h"
 
 #include "base/bind.h"
 #include "dbus/message.h"
diff --git a/chrome/browser/chromeos/dbus/flimflam_client_unittest_base.h b/chromeos/dbus/flimflam_client_unittest_base.h
index cf59bb1..9781fda 100644
--- a/chrome/browser/chromeos/dbus/flimflam_client_unittest_base.h
+++ b/chromeos/dbus/flimflam_client_unittest_base.h
@@ -2,15 +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_FLIMFLAM_CLIENT_UNITTEST_BASE_H_
-#define CHROME_BROWSER_CHROMEOS_DBUS_FLIMFLAM_CLIENT_UNITTEST_BASE_H_
+#ifndef CHROMEOS_DBUS_FLIMFLAM_CLIENT_UNITTEST_BASE_H_
+#define CHROMEOS_DBUS_FLIMFLAM_CLIENT_UNITTEST_BASE_H_
 
 #include <string>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
-#include "chrome/browser/chromeos/dbus/dbus_method_call_status.h"
+#include "chromeos/dbus/dbus_method_call_status.h"
 #include "dbus/mock_bus.h"
 #include "dbus/mock_object_proxy.h"
 #include "dbus/object_proxy.h"
@@ -120,4 +120,4 @@ class FlimflamClientUnittestBase : public testing::Test {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_DBUS_FLIMFLAM_CLIENT_UNITTEST_BASE_H_
+#endif  // CHROMEOS_DBUS_FLIMFLAM_CLIENT_UNITTEST_BASE_H_
diff --git a/chrome/browser/chromeos/dbus/flimflam_ipconfig_client.cc b/chromeos/dbus/flimflam_ipconfig_client.cc
index fd05e5a..2ad5b2a 100644
--- a/chrome/browser/chromeos/dbus/flimflam_ipconfig_client.cc
+++ b/chromeos/dbus/flimflam_ipconfig_client.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/flimflam_ipconfig_client.h"
+#include "chromeos/dbus/flimflam_ipconfig_client.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
diff --git a/chrome/browser/chromeos/dbus/flimflam_ipconfig_client.h b/chromeos/dbus/flimflam_ipconfig_client.h
index 0f7b4fd..80a2074 100644
--- a/chrome/browser/chromeos/dbus/flimflam_ipconfig_client.h
+++ b/chromeos/dbus/flimflam_ipconfig_client.h
@@ -2,15 +2,16 @@
 // 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_FLIMFLAM_IPCONFIG_CLIENT_H_
-#define CHROME_BROWSER_CHROMEOS_DBUS_FLIMFLAM_IPCONFIG_CLIENT_H_
+#ifndef CHROMEOS_DBUS_FLIMFLAM_IPCONFIG_CLIENT_H_
+#define CHROMEOS_DBUS_FLIMFLAM_IPCONFIG_CLIENT_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
-#include "chrome/browser/chromeos/dbus/dbus_client_implementation_type.h"
-#include "chrome/browser/chromeos/dbus/flimflam_client_helper.h"
+#include "chromeos/chromeos_export.h"
+#include "chromeos/dbus/dbus_client_implementation_type.h"
+#include "chromeos/dbus/flimflam_client_helper.h"
 
 namespace base {
 
@@ -31,7 +32,7 @@ namespace chromeos {
 // FlimflamIPConfigClient is used to communicate with the Flimflam IPConfig
 // service.  All methods should be called from the origin thread which
 // initializes the DBusThreadManager instance.
-class FlimflamIPConfigClient {
+class CHROMEOS_EXPORT FlimflamIPConfigClient {
  public:
   typedef FlimflamClientHelper::PropertyChangedHandler PropertyChangedHandler;
   typedef FlimflamClientHelper::VoidCallback VoidCallback;
@@ -79,4 +80,4 @@ class FlimflamIPConfigClient {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_DBUS_FLIMFLAM_IPCONFIG_CLIENT_H_
+#endif  // CHROMEOS_DBUS_FLIMFLAM_IPCONFIG_CLIENT_H_
diff --git a/chrome/browser/chromeos/dbus/flimflam_network_client.cc b/chromeos/dbus/flimflam_network_client.cc
index 9cc8734..9fbd01f 100644
--- a/chrome/browser/chromeos/dbus/flimflam_network_client.cc
+++ b/chromeos/dbus/flimflam_network_client.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/flimflam_network_client.h"
+#include "chromeos/dbus/flimflam_network_client.h"
 
 #include "base/bind.h"
 #include "dbus/bus.h"
diff --git a/chrome/browser/chromeos/dbus/flimflam_network_client.h b/chromeos/dbus/flimflam_network_client.h
index d0d1a5f..902cbe2 100644
--- a/chrome/browser/chromeos/dbus/flimflam_network_client.h
+++ b/chromeos/dbus/flimflam_network_client.h
@@ -2,15 +2,16 @@
 // 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_FLIMFLAM_NETWORK_CLIENT_H_
-#define CHROME_BROWSER_CHROMEOS_DBUS_FLIMFLAM_NETWORK_CLIENT_H_
+#ifndef CHROMEOS_DBUS_FLIMFLAM_NETWORK_CLIENT_H_
+#define CHROMEOS_DBUS_FLIMFLAM_NETWORK_CLIENT_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
-#include "chrome/browser/chromeos/dbus/dbus_client_implementation_type.h"
-#include "chrome/browser/chromeos/dbus/flimflam_client_helper.h"
+#include "chromeos/chromeos_export.h"
+#include "chromeos/dbus/dbus_client_implementation_type.h"
+#include "chromeos/dbus/flimflam_client_helper.h"
 
 namespace base {
 
@@ -30,7 +31,7 @@ namespace chromeos {
 // FlimflamNetworkClient is used to communicate with the Flimflam Network
 // service.  All methods should be called from the origin thread which
 // initializes the DBusThreadManager instance.
-class FlimflamNetworkClient {
+class CHROMEOS_EXPORT FlimflamNetworkClient {
  public:
   typedef FlimflamClientHelper::PropertyChangedHandler PropertyChangedHandler;
   typedef FlimflamClientHelper::DictionaryValueCallback DictionaryValueCallback;
@@ -63,4 +64,4 @@ class FlimflamNetworkClient {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_DBUS_FLIMFLAM_NETWORK_CLIENT_H_
+#endif  // CHROMEOS_DBUS_FLIMFLAM_NETWORK_CLIENT_H_
diff --git a/chrome/browser/chromeos/dbus/flimflam_network_client_unittest.cc b/chromeos/dbus/flimflam_network_client_unittest.cc
index 8b9b4ef1..f17bdbf 100644
--- a/chrome/browser/chromeos/dbus/flimflam_network_client_unittest.cc
+++ b/chromeos/dbus/flimflam_network_client_unittest.cc
@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 #include "base/bind.h"
-#include "chrome/browser/chromeos/dbus/flimflam_client_unittest_base.h"
-#include "chrome/browser/chromeos/dbus/flimflam_network_client.h"
+#include "chromeos/dbus/flimflam_client_unittest_base.h"
+#include "chromeos/dbus/flimflam_network_client.h"
 #include "dbus/message.h"
 #include "dbus/values_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/chromeos/dbus/flimflam_profile_client.cc b/chromeos/dbus/flimflam_profile_client.cc
index 17e43be..81aedb6b 100644
--- a/chrome/browser/chromeos/dbus/flimflam_profile_client.cc
+++ b/chromeos/dbus/flimflam_profile_client.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/flimflam_profile_client.h"
+#include "chromeos/dbus/flimflam_profile_client.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
diff --git a/chrome/browser/chromeos/dbus/flimflam_profile_client.h b/chromeos/dbus/flimflam_profile_client.h
index 8f6bf06..4cc9f70 100644
--- a/chrome/browser/chromeos/dbus/flimflam_profile_client.h
+++ b/chromeos/dbus/flimflam_profile_client.h
@@ -2,15 +2,16 @@
 // 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_FLIMFLAM_PROFILE_CLIENT_H_
-#define CHROME_BROWSER_CHROMEOS_DBUS_FLIMFLAM_PROFILE_CLIENT_H_
+#ifndef CHROMEOS_DBUS_FLIMFLAM_PROFILE_CLIENT_H_
+#define CHROMEOS_DBUS_FLIMFLAM_PROFILE_CLIENT_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
-#include "chrome/browser/chromeos/dbus/dbus_client_implementation_type.h"
-#include "chrome/browser/chromeos/dbus/flimflam_client_helper.h"
+#include "chromeos/chromeos_export.h"
+#include "chromeos/dbus/dbus_client_implementation_type.h"
+#include "chromeos/dbus/flimflam_client_helper.h"
 
 namespace base {
 
@@ -31,7 +32,7 @@ namespace chromeos {
 // FlimflamProfileClient is used to communicate with the Flimflam Profile
 // service.  All methods should be called from the origin thread which
 // initializes the DBusThreadManager instance.
-class FlimflamProfileClient {
+class CHROMEOS_EXPORT FlimflamProfileClient {
  public:
   typedef FlimflamClientHelper::PropertyChangedHandler PropertyChangedHandler;
   typedef FlimflamClientHelper::VoidCallback VoidCallback;
@@ -75,4 +76,4 @@ class FlimflamProfileClient {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_DBUS_FLIMFLAM_PROFILE_CLIENT_H_
+#endif  // CHROMEOS_DBUS_FLIMFLAM_PROFILE_CLIENT_H_
diff --git a/chrome/browser/chromeos/dbus/image_burner_client.cc b/chromeos/dbus/image_burner_client.cc
index 73ced8d..343c02d 100644
--- a/chrome/browser/chromeos/dbus/image_burner_client.cc
+++ b/chromeos/dbus/image_burner_client.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/image_burner_client.h"
+#include "chromeos/dbus/image_burner_client.h"
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
diff --git a/chrome/browser/chromeos/dbus/image_burner_client.h b/chromeos/dbus/image_burner_client.h
index f44489d..513496d 100644
--- a/chrome/browser/chromeos/dbus/image_burner_client.h
+++ b/chromeos/dbus/image_burner_client.h
@@ -2,15 +2,16 @@
 // 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_IMAGE_BURNER_CLIENT_H_
-#define CHROME_BROWSER_CHROMEOS_DBUS_IMAGE_BURNER_CLIENT_H_
+#ifndef CHROMEOS_DBUS_IMAGE_BURNER_CLIENT_H_
+#define CHROMEOS_DBUS_IMAGE_BURNER_CLIENT_H_
 #pragma once
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
-#include "chrome/browser/chromeos/dbus/dbus_client_implementation_type.h"
+#include "chromeos/chromeos_export.h"
+#include "chromeos/dbus/dbus_client_implementation_type.h"
 
 namespace dbus {
 class Bus;
@@ -21,7 +22,7 @@ namespace chromeos {
 // ImageBurnerClient is used to communicate with the image burner.
 // All method should be called from the origin thread (UI thread) which
 // initializes the DBusThreadManager instance.
-class ImageBurnerClient {
+class CHROMEOS_EXPORT ImageBurnerClient {
  public:
   virtual ~ImageBurnerClient();
 
@@ -70,4 +71,4 @@ class ImageBurnerClient {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_DBUS_IMAGE_BURNER_CLIENT_H_
+#endif  // CHROMEOS_DBUS_IMAGE_BURNER_CLIENT_H_
diff --git a/chrome/browser/chromeos/dbus/introspectable_client.cc b/chromeos/dbus/introspectable_client.cc
index 0390456..d29563f 100644
--- a/chrome/browser/chromeos/dbus/introspectable_client.cc
+++ b/chromeos/dbus/introspectable_client.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/introspectable_client.h"
+#include "chromeos/dbus/introspectable_client.h"
 
 #include <string>
 #include <vector>
diff --git a/chrome/browser/chromeos/dbus/introspectable_client.h b/chromeos/dbus/introspectable_client.h
index 29ca796..c21eb94 100644
--- a/chrome/browser/chromeos/dbus/introspectable_client.h
+++ b/chromeos/dbus/introspectable_client.h
@@ -2,15 +2,16 @@
 // 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_INTROSPECTABLE_CLIENT_H_
-#define CHROME_BROWSER_CHROMEOS_DBUS_INTROSPECTABLE_CLIENT_H_
+#ifndef CHROMEOS_DBUS_INTROSPECTABLE_CLIENT_H_
+#define CHROMEOS_DBUS_INTROSPECTABLE_CLIENT_H_
 #pragma once
 
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
-#include "chrome/browser/chromeos/dbus/dbus_client_implementation_type.h"
+#include "chromeos/chromeos_export.h"
+#include "chromeos/dbus/dbus_client_implementation_type.h"
 #include "dbus/object_path.h"
 
 namespace dbus {
@@ -21,7 +22,7 @@ namespace chromeos {
 
 // IntrospectableClient is used to retrieve the D-Bus introspection data
 // from a remote object.
-class IntrospectableClient {
+class CHROMEOS_EXPORT IntrospectableClient {
  public:
   virtual ~IntrospectableClient();
 
@@ -54,4 +55,4 @@ class IntrospectableClient {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_DBUS_INTROSPECTABLE_CLIENT_H_
+#endif  // CHROMEOS_DBUS_INTROSPECTABLE_CLIENT_H_
diff --git a/chrome/browser/chromeos/dbus/mock_bluetooth_adapter_client.cc b/chromeos/dbus/mock_bluetooth_adapter_client.cc
index 1bbc7ef..bef773c 100644
--- a/chrome/browser/chromeos/dbus/mock_bluetooth_adapter_client.cc
+++ b/chromeos/dbus/mock_bluetooth_adapter_client.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // 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/mock_bluetooth_adapter_client.h"
+#include "chromeos/dbus/mock_bluetooth_adapter_client.h"
 
 namespace chromeos {
 
diff --git a/chrome/browser/chromeos/dbus/mock_bluetooth_adapter_client.h b/chromeos/dbus/mock_bluetooth_adapter_client.h
index 43f5a07..4c7e389 100644
--- a/chrome/browser/chromeos/dbus/mock_bluetooth_adapter_client.h
+++ b/chromeos/dbus/mock_bluetooth_adapter_client.h
@@ -2,12 +2,12 @@
 // 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_MOCK_BLUETOOTH_ADAPTER_CLIENT_H_
-#define CHROME_BROWSER_CHROMEOS_DBUS_MOCK_BLUETOOTH_ADAPTER_CLIENT_H_
+#ifndef CHROMEOS_DBUS_MOCK_BLUETOOTH_ADAPTER_CLIENT_H_
+#define CHROMEOS_DBUS_MOCK_BLUETOOTH_ADAPTER_CLIENT_H_
 
 #include <string>
 
-#include "chrome/browser/chromeos/dbus/bluetooth_adapter_client.h"
+#include "chromeos/dbus/bluetooth_adapter_client.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace chromeos {
@@ -56,4 +56,4 @@ class MockBluetoothAdapterClient : public BluetoothAdapterClient {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_DBUS_MOCK_BLUETOOTH_ADAPTER_CLIENT_H_
+#endif  // CHROMEOS_DBUS_MOCK_BLUETOOTH_ADAPTER_CLIENT_H_
diff --git a/chrome/browser/chromeos/dbus/mock_bluetooth_device_client.cc b/chromeos/dbus/mock_bluetooth_device_client.cc
index 1daed2d..75b5c44 100644
--- a/chrome/browser/chromeos/dbus/mock_bluetooth_device_client.cc
+++ b/chromeos/dbus/mock_bluetooth_device_client.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/mock_bluetooth_device_client.h"
+#include "chromeos/dbus/mock_bluetooth_device_client.h"
 
 namespace chromeos {
 
diff --git a/chrome/browser/chromeos/dbus/mock_bluetooth_device_client.h b/chromeos/dbus/mock_bluetooth_device_client.h
index 2365002..35050e2 100644
--- a/chrome/browser/chromeos/dbus/mock_bluetooth_device_client.h
+++ b/chromeos/dbus/mock_bluetooth_device_client.h
@@ -2,12 +2,12 @@
 // 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_MOCK_BLUETOOTH_DEVICE_CLIENT_H_
-#define CHROME_BROWSER_CHROMEOS_DBUS_MOCK_BLUETOOTH_DEVICE_CLIENT_H_
+#ifndef CHROMEOS_DBUS_MOCK_BLUETOOTH_DEVICE_CLIENT_H_
+#define CHROMEOS_DBUS_MOCK_BLUETOOTH_DEVICE_CLIENT_H_
 
 #include <string>
 
-#include "chrome/browser/chromeos/dbus/bluetooth_device_client.h"
+#include "chromeos/dbus/bluetooth_device_client.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace chromeos {
@@ -37,4 +37,4 @@ class MockBluetoothDeviceClient : public BluetoothDeviceClient {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_DBUS_MOCK_BLUETOOTH_DEVICE_CLIENT_H_
+#endif  // CHROMEOS_DBUS_MOCK_BLUETOOTH_DEVICE_CLIENT_H_
diff --git a/chrome/browser/chromeos/dbus/mock_bluetooth_input_client.cc b/chromeos/dbus/mock_bluetooth_input_client.cc
index 2d20bd6..b73ef1e 100644
--- a/chrome/browser/chromeos/dbus/mock_bluetooth_input_client.cc
+++ b/chromeos/dbus/mock_bluetooth_input_client.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/mock_bluetooth_input_client.h"
+#include "chromeos/dbus/mock_bluetooth_input_client.h"
 
 namespace chromeos {
 
diff --git a/chrome/browser/chromeos/dbus/mock_bluetooth_input_client.h b/chromeos/dbus/mock_bluetooth_input_client.h
index f4d2bc9..35fe0cb 100644
--- a/chrome/browser/chromeos/dbus/mock_bluetooth_input_client.h
+++ b/chromeos/dbus/mock_bluetooth_input_client.h
@@ -2,12 +2,12 @@
 // 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_MOCK_BLUETOOTH_INPUT_CLIENT_H_
-#define CHROME_BROWSER_CHROMEOS_DBUS_MOCK_BLUETOOTH_INPUT_CLIENT_H_
+#ifndef CHROMEOS_DBUS_MOCK_BLUETOOTH_INPUT_CLIENT_H_
+#define CHROMEOS_DBUS_MOCK_BLUETOOTH_INPUT_CLIENT_H_
 
 #include <string>
 
-#include "chrome/browser/chromeos/dbus/bluetooth_input_client.h"
+#include "chromeos/dbus/bluetooth_input_client.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace chromeos {
@@ -28,4 +28,4 @@ class MockBluetoothInputClient : public BluetoothInputClient {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_DBUS_MOCK_BLUETOOTH_INPUT_CLIENT_H_
+#endif  // CHROMEOS_DBUS_MOCK_BLUETOOTH_INPUT_CLIENT_H_
diff --git a/chrome/browser/chromeos/dbus/mock_bluetooth_manager_client.cc b/chromeos/dbus/mock_bluetooth_manager_client.cc
index 6941581..9fd6f93 100644
--- a/chrome/browser/chromeos/dbus/mock_bluetooth_manager_client.cc
+++ b/chromeos/dbus/mock_bluetooth_manager_client.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // 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/mock_bluetooth_manager_client.h"
+#include "chromeos/dbus/mock_bluetooth_manager_client.h"
 
 namespace chromeos {
 
diff --git a/chrome/browser/chromeos/dbus/mock_bluetooth_manager_client.h b/chromeos/dbus/mock_bluetooth_manager_client.h
index 549519e..9485e24 100644
--- a/chrome/browser/chromeos/dbus/mock_bluetooth_manager_client.h
+++ b/chromeos/dbus/mock_bluetooth_manager_client.h
@@ -2,12 +2,12 @@
 // 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_MOCK_BLUETOOTH_MANAGER_CLIENT_H_
-#define CHROME_BROWSER_CHROMEOS_DBUS_MOCK_BLUETOOTH_MANAGER_CLIENT_H_
+#ifndef CHROMEOS_DBUS_MOCK_BLUETOOTH_MANAGER_CLIENT_H_
+#define CHROMEOS_DBUS_MOCK_BLUETOOTH_MANAGER_CLIENT_H_
 
 #include <string>
 
-#include "chrome/browser/chromeos/dbus/bluetooth_manager_client.h"
+#include "chromeos/dbus/bluetooth_manager_client.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace chromeos {
@@ -27,4 +27,4 @@ class MockBluetoothManagerClient : public BluetoothManagerClient {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_DBUS_MOCK_BLUETOOTH_MANAGER_CLIENT_H_
+#endif  // CHROMEOS_DBUS_MOCK_BLUETOOTH_MANAGER_CLIENT_H_
diff --git a/chrome/browser/chromeos/dbus/mock_bluetooth_node_client.cc b/chromeos/dbus/mock_bluetooth_node_client.cc
index 4d38c03..fddd878 100644
--- a/chrome/browser/chromeos/dbus/mock_bluetooth_node_client.cc
+++ b/chromeos/dbus/mock_bluetooth_node_client.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/mock_bluetooth_node_client.h"
+#include "chromeos/dbus/mock_bluetooth_node_client.h"
 
 namespace chromeos {
 
diff --git a/chrome/browser/chromeos/dbus/mock_bluetooth_node_client.h b/chromeos/dbus/mock_bluetooth_node_client.h
index 9642e03..78b1497 100644
--- a/chrome/browser/chromeos/dbus/mock_bluetooth_node_client.h
+++ b/chromeos/dbus/mock_bluetooth_node_client.h
@@ -2,12 +2,12 @@
 // 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_MOCK_BLUETOOTH_NODE_CLIENT_H_
-#define CHROME_BROWSER_CHROMEOS_DBUS_MOCK_BLUETOOTH_NODE_CLIENT_H_
+#ifndef CHROMEOS_DBUS_MOCK_BLUETOOTH_NODE_CLIENT_H_
+#define CHROMEOS_DBUS_MOCK_BLUETOOTH_NODE_CLIENT_H_
 
 #include <string>
 
-#include "chrome/browser/chromeos/dbus/bluetooth_node_client.h"
+#include "chromeos/dbus/bluetooth_node_client.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace chromeos {
@@ -24,4 +24,4 @@ class MockBluetoothNodeClient : public BluetoothNodeClient {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_DBUS_MOCK_BLUETOOTH_NODE_CLIENT_H_
+#endif  // CHROMEOS_DBUS_MOCK_BLUETOOTH_NODE_CLIENT_H_
diff --git a/chrome/browser/chromeos/dbus/mock_cashew_client.cc b/chromeos/dbus/mock_cashew_client.cc
index 8dae9b6..1742ab2 100644
--- a/chrome/browser/chromeos/dbus/mock_cashew_client.cc
+++ b/chromeos/dbus/mock_cashew_client.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/mock_cashew_client.h"
+#include "chromeos/dbus/mock_cashew_client.h"
 
 namespace chromeos {
 
diff --git a/chrome/browser/chromeos/dbus/mock_cashew_client.h b/chromeos/dbus/mock_cashew_client.h
index d139d03..c4167dc 100644
--- a/chrome/browser/chromeos/dbus/mock_cashew_client.h
+++ b/chromeos/dbus/mock_cashew_client.h
@@ -2,11 +2,11 @@
 // 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_MOCK_CASHEW_CLIENT_H_
-#define CHROME_BROWSER_CHROMEOS_DBUS_MOCK_CASHEW_CLIENT_H_
+#ifndef CHROMEOS_DBUS_MOCK_CASHEW_CLIENT_H_
+#define CHROMEOS_DBUS_MOCK_CASHEW_CLIENT_H_
 #pragma once
 
-#include "chrome/browser/chromeos/dbus/cashew_client.h"
+#include "chromeos/dbus/cashew_client.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace chromeos {
@@ -23,4 +23,4 @@ class MockCashewClient : public CashewClient {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_DBUS_MOCK_CASHEW_CLIENT_H_
+#endif  // CHROMEOS_DBUS_MOCK_CASHEW_CLIENT_H_
diff --git a/chrome/browser/chromeos/dbus/mock_cros_disks_client.cc b/chromeos/dbus/mock_cros_disks_client.cc
index 48a0742..998c550 100644
--- a/chrome/browser/chromeos/dbus/mock_cros_disks_client.cc
+++ b/chromeos/dbus/mock_cros_disks_client.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // 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/mock_cros_disks_client.h"
+#include "chromeos/dbus/mock_cros_disks_client.h"
 
 namespace chromeos {
 
diff --git a/chrome/browser/chromeos/dbus/mock_cros_disks_client.h b/chromeos/dbus/mock_cros_disks_client.h
index 46a6875..0b242f98 100644
--- a/chrome/browser/chromeos/dbus/mock_cros_disks_client.h
+++ b/chromeos/dbus/mock_cros_disks_client.h
@@ -1,14 +1,14 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // 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_MOCK_CROS_DISKS_CLIENT_H_
-#define CHROME_BROWSER_CHROMEOS_DBUS_MOCK_CROS_DISKS_CLIENT_H_
+#ifndef CHROMEOS_DBUS_MOCK_CROS_DISKS_CLIENT_H_
+#define CHROMEOS_DBUS_MOCK_CROS_DISKS_CLIENT_H_
 #pragma once
 
 #include <string>
 
-#include "chrome/browser/chromeos/dbus/cros_disks_client.h"
+#include "chromeos/dbus/cros_disks_client.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace chromeos {
@@ -34,4 +34,4 @@ class MockCrosDisksClient : public CrosDisksClient {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_DBUS_MOCK_CROS_DISKS_CLIENT_H_
+#endif  // CHROMEOS_DBUS_MOCK_CROS_DISKS_CLIENT_H_
diff --git a/chrome/browser/chromeos/dbus/mock_cryptohome_client.cc b/chromeos/dbus/mock_cryptohome_client.cc
index 8166e58..6ef380d 100644
--- a/chrome/browser/chromeos/dbus/mock_cryptohome_client.cc
+++ b/chromeos/dbus/mock_cryptohome_client.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/mock_cryptohome_client.h"
+#include "chromeos/dbus/mock_cryptohome_client.h"
 
 namespace chromeos {
 
diff --git a/chrome/browser/chromeos/dbus/mock_cryptohome_client.h b/chromeos/dbus/mock_cryptohome_client.h
index e313e414..ad6c327 100644
--- a/chrome/browser/chromeos/dbus/mock_cryptohome_client.h
+++ b/chromeos/dbus/mock_cryptohome_client.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_MOCK_CRYPTOHOME_CLIENT_H_
-#define CHROME_BROWSER_CHROMEOS_DBUS_MOCK_CRYPTOHOME_CLIENT_H_
+#ifndef CHROMEOS_DBUS_MOCK_CRYPTOHOME_CLIENT_H_
+#define CHROMEOS_DBUS_MOCK_CRYPTOHOME_CLIENT_H_
 #pragma once
 
 #include <string>
 
-#include "chrome/browser/chromeos/dbus/cryptohome_client.h"
+#include "chromeos/dbus/cryptohome_client.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace chromeos {
@@ -67,4 +67,4 @@ class MockCryptohomeClient : public CryptohomeClient {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_DBUS_MOCK_CRYPTOHOME_CLIENT_H_
+#endif  // CHROMEOS_DBUS_MOCK_CRYPTOHOME_CLIENT_H_
diff --git a/chrome/browser/chromeos/dbus/mock_dbus_thread_manager.cc b/chromeos/dbus/mock_dbus_thread_manager.cc
index 843bb4f..7687c10 100644
--- a/chrome/browser/chromeos/dbus/mock_dbus_thread_manager.cc
+++ b/chromeos/dbus/mock_dbus_thread_manager.cc
@@ -2,26 +2,26 @@
 // 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/mock_dbus_thread_manager.h"
+#include "chromeos/dbus/mock_dbus_thread_manager.h"
 
-#include "chrome/browser/chromeos/dbus/mock_bluetooth_adapter_client.h"
-#include "chrome/browser/chromeos/dbus/mock_bluetooth_device_client.h"
-#include "chrome/browser/chromeos/dbus/mock_bluetooth_input_client.h"
-#include "chrome/browser/chromeos/dbus/mock_bluetooth_manager_client.h"
-#include "chrome/browser/chromeos/dbus/mock_bluetooth_node_client.h"
-#include "chrome/browser/chromeos/dbus/mock_cashew_client.h"
-#include "chrome/browser/chromeos/dbus/mock_cros_disks_client.h"
-#include "chrome/browser/chromeos/dbus/mock_cryptohome_client.h"
-#include "chrome/browser/chromeos/dbus/mock_debug_daemon_client.h"
-#include "chrome/browser/chromeos/dbus/mock_flimflam_ipconfig_client.h"
-#include "chrome/browser/chromeos/dbus/mock_flimflam_network_client.h"
-#include "chrome/browser/chromeos/dbus/mock_flimflam_profile_client.h"
-#include "chrome/browser/chromeos/dbus/mock_image_burner_client.h"
-#include "chrome/browser/chromeos/dbus/mock_introspectable_client.h"
-#include "chrome/browser/chromeos/dbus/mock_power_manager_client.h"
-#include "chrome/browser/chromeos/dbus/mock_session_manager_client.h"
-#include "chrome/browser/chromeos/dbus/mock_speech_synthesizer_client.h"
-#include "chrome/browser/chromeos/dbus/mock_update_engine_client.h"
+#include "chromeos/dbus/mock_bluetooth_adapter_client.h"
+#include "chromeos/dbus/mock_bluetooth_device_client.h"
+#include "chromeos/dbus/mock_bluetooth_input_client.h"
+#include "chromeos/dbus/mock_bluetooth_manager_client.h"
+#include "chromeos/dbus/mock_bluetooth_node_client.h"
+#include "chromeos/dbus/mock_cashew_client.h"
+#include "chromeos/dbus/mock_cros_disks_client.h"
+#include "chromeos/dbus/mock_cryptohome_client.h"
+#include "chromeos/dbus/mock_debug_daemon_client.h"
+#include "chromeos/dbus/mock_flimflam_ipconfig_client.h"
+#include "chromeos/dbus/mock_flimflam_network_client.h"
+#include "chromeos/dbus/mock_flimflam_profile_client.h"
+#include "chromeos/dbus/mock_image_burner_client.h"
+#include "chromeos/dbus/mock_introspectable_client.h"
+#include "chromeos/dbus/mock_power_manager_client.h"
+#include "chromeos/dbus/mock_session_manager_client.h"
+#include "chromeos/dbus/mock_speech_synthesizer_client.h"
+#include "chromeos/dbus/mock_update_engine_client.h"
 
 using ::testing::AnyNumber;
 using ::testing::Return;
diff --git a/chrome/browser/chromeos/dbus/mock_dbus_thread_manager.h b/chromeos/dbus/mock_dbus_thread_manager.h
index 3402fcb..2088eeb 100644
--- a/chrome/browser/chromeos/dbus/mock_dbus_thread_manager.h
+++ b/chromeos/dbus/mock_dbus_thread_manager.h
@@ -2,12 +2,12 @@
 // 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_MOCK_DBUS_THREAD_MANAGER_H_
-#define CHROME_BROWSER_CHROMEOS_DBUS_MOCK_DBUS_THREAD_MANAGER_H_
+#ifndef CHROMEOS_DBUS_MOCK_DBUS_THREAD_MANAGER_H_
+#define CHROMEOS_DBUS_MOCK_DBUS_THREAD_MANAGER_H_
 
 #include <string>
 
-#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace dbus {
@@ -145,4 +145,4 @@ class MockDBusThreadManager : public DBusThreadManager {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_DBUS_MOCK_DBUS_THREAD_MANAGER_H_
+#endif  // CHROMEOS_DBUS_MOCK_DBUS_THREAD_MANAGER_H_
diff --git a/chrome/browser/chromeos/dbus/mock_debug_daemon_client.cc b/chromeos/dbus/mock_debug_daemon_client.cc
index 4d1e5b6..4e9430a 100644
--- a/chrome/browser/chromeos/dbus/mock_debug_daemon_client.cc
+++ b/chromeos/dbus/mock_debug_daemon_client.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/mock_debug_daemon_client.h"
+#include "chromeos/dbus/mock_debug_daemon_client.h"
 
 namespace chromeos {
 
diff --git a/chrome/browser/chromeos/dbus/mock_debug_daemon_client.h b/chromeos/dbus/mock_debug_daemon_client.h
index 9d825c3..05f553f 100644
--- a/chrome/browser/chromeos/dbus/mock_debug_daemon_client.h
+++ b/chromeos/dbus/mock_debug_daemon_client.h
@@ -2,10 +2,10 @@
 // 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_MOCK_DEBUG_DAEMON_CLIENT_H_
-#define CHROME_BROWSER_CHROMEOS_DBUS_MOCK_DEBUG_DAEMON_CLIENT_H_
+#ifndef CHROMEOS_DBUS_MOCK_DEBUG_DAEMON_CLIENT_H_
+#define CHROMEOS_DBUS_MOCK_DEBUG_DAEMON_CLIENT_H_
 
-#include "chrome/browser/chromeos/dbus/debug_daemon_client.h"
+#include "chromeos/dbus/debug_daemon_client.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace chromeos {
@@ -22,4 +22,4 @@ class MockDebugDaemonClient : public DebugDaemonClient {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_DBUS_MOCK_DEBUG_DAEMON_CLIENT_H_
+#endif  // CHROMEOS_DBUS_MOCK_DEBUG_DAEMON_CLIENT_H_
diff --git a/chrome/browser/chromeos/dbus/mock_flimflam_ipconfig_client.cc b/chromeos/dbus/mock_flimflam_ipconfig_client.cc
index ad12f8b..62ca0cf 100644
--- a/chrome/browser/chromeos/dbus/mock_flimflam_ipconfig_client.cc
+++ b/chromeos/dbus/mock_flimflam_ipconfig_client.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/mock_flimflam_ipconfig_client.h"
+#include "chromeos/dbus/mock_flimflam_ipconfig_client.h"
 
 namespace chromeos {
 
diff --git a/chrome/browser/chromeos/dbus/mock_flimflam_ipconfig_client.h b/chromeos/dbus/mock_flimflam_ipconfig_client.h
index 71d1a27..7e98da0 100644
--- a/chrome/browser/chromeos/dbus/mock_flimflam_ipconfig_client.h
+++ b/chromeos/dbus/mock_flimflam_ipconfig_client.h
@@ -2,11 +2,11 @@
 // 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_MOCK_FLIMFLAM_IPCONFIG_CLIENT_H_
-#define CHROME_BROWSER_CHROMEOS_DBUS_MOCK_FLIMFLAM_IPCONFIG_CLIENT_H_
+#ifndef CHROMEOS_DBUS_MOCK_FLIMFLAM_IPCONFIG_CLIENT_H_
+#define CHROMEOS_DBUS_MOCK_FLIMFLAM_IPCONFIG_CLIENT_H_
 
 #include "base/values.h"
-#include "chrome/browser/chromeos/dbus/flimflam_ipconfig_client.h"
+#include "chromeos/dbus/flimflam_ipconfig_client.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace chromeos {
@@ -30,4 +30,4 @@ class MockFlimflamIPConfigClient : public FlimflamIPConfigClient {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_DBUS_MOCK_FLIMFLAM_IPCONFIG_CLIENT_H_
+#endif  // CHROMEOS_DBUS_MOCK_FLIMFLAM_IPCONFIG_CLIENT_H_
diff --git a/chrome/browser/chromeos/dbus/mock_flimflam_network_client.cc b/chromeos/dbus/mock_flimflam_network_client.cc
index 8af1ed3..e190375 100644
--- a/chrome/browser/chromeos/dbus/mock_flimflam_network_client.cc
+++ b/chromeos/dbus/mock_flimflam_network_client.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/mock_flimflam_network_client.h"
+#include "chromeos/dbus/mock_flimflam_network_client.h"
 
 namespace chromeos {
 
diff --git a/chrome/browser/chromeos/dbus/mock_flimflam_network_client.h b/chromeos/dbus/mock_flimflam_network_client.h
index 6b51596..df0d31b 100644
--- a/chrome/browser/chromeos/dbus/mock_flimflam_network_client.h
+++ b/chromeos/dbus/mock_flimflam_network_client.h
@@ -2,10 +2,10 @@
 // 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_MOCK_FLIMFLAM_NETWORK_CLIENT_H_
-#define CHROME_BROWSER_CHROMEOS_DBUS_MOCK_FLIMFLAM_NETWORK_CLIENT_H_
+#ifndef CHROMEOS_DBUS_MOCK_FLIMFLAM_NETWORK_CLIENT_H_
+#define CHROMEOS_DBUS_MOCK_FLIMFLAM_NETWORK_CLIENT_H_
 
-#include "chrome/browser/chromeos/dbus/flimflam_network_client.h"
+#include "chromeos/dbus/flimflam_network_client.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace chromeos {
@@ -23,4 +23,4 @@ class MockFlimflamNetworkClient : public FlimflamNetworkClient {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_DBUS_MOCK_FLIMFLAM_NETWORK_CLIENT_H_
+#endif  // CHROMEOS_DBUS_MOCK_FLIMFLAM_NETWORK_CLIENT_H_
diff --git a/chrome/browser/chromeos/dbus/mock_flimflam_profile_client.cc b/chromeos/dbus/mock_flimflam_profile_client.cc
index b35335b..a9dc01e 100644
--- a/chrome/browser/chromeos/dbus/mock_flimflam_profile_client.cc
+++ b/chromeos/dbus/mock_flimflam_profile_client.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/mock_flimflam_profile_client.h"
+#include "chromeos/dbus/mock_flimflam_profile_client.h"
 
 namespace chromeos {
 
diff --git a/chrome/browser/chromeos/dbus/mock_flimflam_profile_client.h b/chromeos/dbus/mock_flimflam_profile_client.h
index ccbf012..61afc1b 100644
--- a/chrome/browser/chromeos/dbus/mock_flimflam_profile_client.h
+++ b/chromeos/dbus/mock_flimflam_profile_client.h
@@ -2,11 +2,11 @@
 // 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_MOCK_FLIMFLAM_PROFILE_CLIENT_H_
-#define CHROME_BROWSER_CHROMEOS_DBUS_MOCK_FLIMFLAM_PROFILE_CLIENT_H_
+#ifndef CHROMEOS_DBUS_MOCK_FLIMFLAM_PROFILE_CLIENT_H_
+#define CHROMEOS_DBUS_MOCK_FLIMFLAM_PROFILE_CLIENT_H_
 
 #include "base/values.h"
-#include "chrome/browser/chromeos/dbus/flimflam_profile_client.h"
+#include "chromeos/dbus/flimflam_profile_client.h"
 #include "dbus/object_path.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
@@ -29,4 +29,4 @@ class MockFlimflamProfileClient : public FlimflamProfileClient {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_DBUS_MOCK_FLIMFLAM_PROFILE_CLIENT_H_
+#endif  // CHROMEOS_DBUS_MOCK_FLIMFLAM_PROFILE_CLIENT_H_
diff --git a/chrome/browser/chromeos/dbus/mock_image_burner_client.cc b/chromeos/dbus/mock_image_burner_client.cc
index 356a3e8..fb95831 100644
--- a/chrome/browser/chromeos/dbus/mock_image_burner_client.cc
+++ b/chromeos/dbus/mock_image_burner_client.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/mock_image_burner_client.h"
+#include "chromeos/dbus/mock_image_burner_client.h"
 
 namespace chromeos {
 
diff --git a/chrome/browser/chromeos/dbus/mock_image_burner_client.h b/chromeos/dbus/mock_image_burner_client.h
index d0fabb5..8db0a44 100644
--- a/chrome/browser/chromeos/dbus/mock_image_burner_client.h
+++ b/chromeos/dbus/mock_image_burner_client.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_MOCK_IMAGE_BURNER_CLIENT_H_
-#define CHROME_BROWSER_CHROMEOS_DBUS_MOCK_IMAGE_BURNER_CLIENT_H_
+#ifndef CHROMEOS_DBUS_MOCK_IMAGE_BURNER_CLIENT_H_
+#define CHROMEOS_DBUS_MOCK_IMAGE_BURNER_CLIENT_H_
 #pragma once
 
 #include <string>
 
-#include "chrome/browser/chromeos/dbus/image_burner_client.h"
+#include "chromeos/dbus/image_burner_client.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace chromeos {
@@ -28,4 +28,4 @@ class MockImageBurnerClient : public ImageBurnerClient {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_DBUS_MOCK_IMAGE_BURNER_CLIENT_H_
+#endif  // CHROMEOS_DBUS_MOCK_IMAGE_BURNER_CLIENT_H_
diff --git a/chrome/browser/chromeos/dbus/mock_introspectable_client.cc b/chromeos/dbus/mock_introspectable_client.cc
index 1f3e34f..27ece38 100644
--- a/chrome/browser/chromeos/dbus/mock_introspectable_client.cc
+++ b/chromeos/dbus/mock_introspectable_client.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/mock_introspectable_client.h"
+#include "chromeos/dbus/mock_introspectable_client.h"
 
 namespace chromeos {
 
diff --git a/chrome/browser/chromeos/dbus/mock_introspectable_client.h b/chromeos/dbus/mock_introspectable_client.h
index e71e300..6a10de6 100644
--- a/chrome/browser/chromeos/dbus/mock_introspectable_client.h
+++ b/chromeos/dbus/mock_introspectable_client.h
@@ -2,10 +2,10 @@
 // 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_MOCK_INTROSPECTABLE_CLIENT_H_
-#define CHROME_BROWSER_CHROMEOS_DBUS_MOCK_INTROSPECTABLE_CLIENT_H_
+#ifndef CHROMEOS_DBUS_MOCK_INTROSPECTABLE_CLIENT_H_
+#define CHROMEOS_DBUS_MOCK_INTROSPECTABLE_CLIENT_H_
 
-#include "chrome/browser/chromeos/dbus/introspectable_client.h"
+#include "chromeos/dbus/introspectable_client.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace chromeos {
@@ -22,4 +22,4 @@ class MockIntrospectableClient : public IntrospectableClient {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_DBUS_MOCK_INTROSPECTABLE_CLIENT_H_
+#endif  // CHROMEOS_DBUS_MOCK_INTROSPECTABLE_CLIENT_H_
diff --git a/chrome/browser/chromeos/dbus/mock_power_manager_client.cc b/chromeos/dbus/mock_power_manager_client.cc
index 1179179..34c5170 100644
--- a/chrome/browser/chromeos/dbus/mock_power_manager_client.cc
+++ b/chromeos/dbus/mock_power_manager_client.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // 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/mock_power_manager_client.h"
+#include "chromeos/dbus/mock_power_manager_client.h"
 
 namespace chromeos {
 
diff --git a/chrome/browser/chromeos/dbus/mock_power_manager_client.h b/chromeos/dbus/mock_power_manager_client.h
index dd95aa6..e4eb030 100644
--- a/chrome/browser/chromeos/dbus/mock_power_manager_client.h
+++ b/chromeos/dbus/mock_power_manager_client.h
@@ -2,12 +2,12 @@
 // 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_MOCK_POWER_MANAGER_CLIENT_H_
-#define CHROME_BROWSER_CHROMEOS_DBUS_MOCK_POWER_MANAGER_CLIENT_H_
+#ifndef CHROMEOS_DBUS_MOCK_POWER_MANAGER_CLIENT_H_
+#define CHROMEOS_DBUS_MOCK_POWER_MANAGER_CLIENT_H_
 
 #include <string>
 
-#include "chrome/browser/chromeos/dbus/power_manager_client.h"
+#include "chromeos/dbus/power_manager_client.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace chromeos {
@@ -43,4 +43,4 @@ class MockPowerManagerClient : public PowerManagerClient {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_DBUS_MOCK_POWER_MANAGER_CLIENT_H_
+#endif  // CHROMEOS_DBUS_MOCK_POWER_MANAGER_CLIENT_H_
diff --git a/chrome/browser/chromeos/dbus/mock_session_manager_client.cc b/chromeos/dbus/mock_session_manager_client.cc
index 1919d00..a4b260a 100644
--- a/chrome/browser/chromeos/dbus/mock_session_manager_client.cc
+++ b/chromeos/dbus/mock_session_manager_client.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // 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/mock_session_manager_client.h"
+#include "chromeos/dbus/mock_session_manager_client.h"
 
 namespace chromeos {
 
diff --git a/chrome/browser/chromeos/dbus/mock_session_manager_client.h b/chromeos/dbus/mock_session_manager_client.h
index 7c6b41b..6ed73bb 100644
--- a/chrome/browser/chromeos/dbus/mock_session_manager_client.h
+++ b/chromeos/dbus/mock_session_manager_client.h
@@ -2,12 +2,12 @@
 // 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_MOCK_SESSION_MANAGER_CLIENT_H_
-#define CHROME_BROWSER_CHROMEOS_DBUS_MOCK_SESSION_MANAGER_CLIENT_H_
+#ifndef CHROMEOS_DBUS_MOCK_SESSION_MANAGER_CLIENT_H_
+#define CHROMEOS_DBUS_MOCK_SESSION_MANAGER_CLIENT_H_
 
 #include <string>
 
-#include "chrome/browser/chromeos/dbus/session_manager_client.h"
+#include "chromeos/dbus/session_manager_client.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace chromeos {
@@ -35,4 +35,4 @@ class MockSessionManagerClient : public SessionManagerClient {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_DBUS_MOCK_SESSION_MANAGER_CLIENT_H_
+#endif  // CHROMEOS_DBUS_MOCK_SESSION_MANAGER_CLIENT_H_
diff --git a/chrome/browser/chromeos/dbus/mock_speech_synthesizer_client.cc b/chromeos/dbus/mock_speech_synthesizer_client.cc
index 0736308..1bd847e 100644
--- a/chrome/browser/chromeos/dbus/mock_speech_synthesizer_client.cc
+++ b/chromeos/dbus/mock_speech_synthesizer_client.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // 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/mock_speech_synthesizer_client.h"
+#include "chromeos/dbus/mock_speech_synthesizer_client.h"
 
 namespace chromeos {
 
diff --git a/chrome/browser/chromeos/dbus/mock_speech_synthesizer_client.h b/chromeos/dbus/mock_speech_synthesizer_client.h
index 52eec13..f687df4 100644
--- a/chrome/browser/chromeos/dbus/mock_speech_synthesizer_client.h
+++ b/chromeos/dbus/mock_speech_synthesizer_client.h
@@ -2,12 +2,12 @@
 // 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_MOCK_SPEECH_SYNTHESIZER_CLIENT_H_
-#define CHROME_BROWSER_CHROMEOS_DBUS_MOCK_SPEECH_SYNTHESIZER_CLIENT_H_
+#ifndef CHROMEOS_DBUS_MOCK_SPEECH_SYNTHESIZER_CLIENT_H_
+#define CHROMEOS_DBUS_MOCK_SPEECH_SYNTHESIZER_CLIENT_H_
 
 #include <string>
 
-#include "chrome/browser/chromeos/dbus/speech_synthesizer_client.h"
+#include "chromeos/dbus/speech_synthesizer_client.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace chromeos {
@@ -24,4 +24,4 @@ class MockSpeechSynthesizerClient : public SpeechSynthesizerClient {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_DBUS_MOCK_SPEECH_SYNTHESIZER_CLIENT_H_
+#endif  // CHROMEOS_DBUS_MOCK_SPEECH_SYNTHESIZER_CLIENT_H_
diff --git a/chrome/browser/chromeos/dbus/mock_update_engine_client.cc b/chromeos/dbus/mock_update_engine_client.cc
index 93379d4..32ba344 100644
--- a/chrome/browser/chromeos/dbus/mock_update_engine_client.cc
+++ b/chromeos/dbus/mock_update_engine_client.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // 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/mock_update_engine_client.h"
+#include "chromeos/dbus/mock_update_engine_client.h"
 
 namespace chromeos {
 
diff --git a/chrome/browser/chromeos/dbus/mock_update_engine_client.h b/chromeos/dbus/mock_update_engine_client.h
index 21d6f4e..385a0c5 100644
--- a/chrome/browser/chromeos/dbus/mock_update_engine_client.h
+++ b/chromeos/dbus/mock_update_engine_client.h
@@ -1,13 +1,13 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // 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_MOCK_UPDATE_ENGINE_CLIENT_H_
-#define CHROME_BROWSER_CHROMEOS_DBUS_MOCK_UPDATE_ENGINE_CLIENT_H_
+#ifndef CHROMEOS_DBUS_MOCK_UPDATE_ENGINE_CLIENT_H_
+#define CHROMEOS_DBUS_MOCK_UPDATE_ENGINE_CLIENT_H_
 
 #include <string>
 
-#include "chrome/browser/chromeos/dbus/update_engine_client.h"
+#include "chromeos/dbus/update_engine_client.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace chromeos {
@@ -29,4 +29,4 @@ class MockUpdateEngineClient : public UpdateEngineClient {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_DBUS_MOCK_UPDATE_ENGINE_CLIENT_H_
+#endif  // CHROMEOS_DBUS_MOCK_UPDATE_ENGINE_CLIENT_H_
diff --git a/chrome/browser/chromeos/dbus/power_manager_client.cc b/chromeos/dbus/power_manager_client.cc
index d089e9d..d74feab 100644
--- a/chrome/browser/chromeos/dbus/power_manager_client.cc
+++ b/chromeos/dbus/power_manager_client.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/power_manager_client.h"
+#include "chromeos/dbus/power_manager_client.h"
 
 #include <algorithm>
 
@@ -14,8 +14,8 @@
 #include "base/stringprintf.h"
 #include "base/time.h"
 #include "base/timer.h"
-#include "chrome/browser/chromeos/dbus/power_supply_properties.pb.h"
-#include "chrome/browser/chromeos/dbus/power_state_control.pb.h"
+#include "chromeos/dbus/power_state_control.pb.h"
+#include "chromeos/dbus/power_supply_properties.pb.h"
 #include "dbus/bus.h"
 #include "dbus/message.h"
 #include "dbus/object_path.h"
diff --git a/chrome/browser/chromeos/dbus/power_manager_client.h b/chromeos/dbus/power_manager_client.h
index 0c7c3b1..3100de8 100644
--- a/chrome/browser/chromeos/dbus/power_manager_client.h
+++ b/chromeos/dbus/power_manager_client.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_POWER_MANAGER_CLIENT_H_
-#define CHROME_BROWSER_CHROMEOS_DBUS_POWER_MANAGER_CLIENT_H_
+#ifndef CHROMEOS_DBUS_POWER_MANAGER_CLIENT_H_
+#define CHROMEOS_DBUS_POWER_MANAGER_CLIENT_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
-#include "chrome/browser/chromeos/dbus/dbus_client_implementation_type.h"
+#include "chromeos/chromeos_export.h"
+#include "chromeos/dbus/dbus_client_implementation_type.h"
 
 #include "chromeos/dbus/power_supply_status.h"
 
@@ -33,7 +34,7 @@ typedef base::Callback<void(uint32)> PowerStateRequestIdCallback;
 typedef base::Callback<void(double)> GetScreenBrightnessPercentCallback;
 
 // PowerManagerClient is used to communicate with the power manager.
-class PowerManagerClient {
+class CHROMEOS_EXPORT PowerManagerClient {
  public:
   // Interface for observing changes from the power manager.
   class Observer {
@@ -179,4 +180,4 @@ class PowerManagerClient {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_DBUS_POWER_MANAGER_CLIENT_H_
+#endif  // CHROMEOS_DBUS_POWER_MANAGER_CLIENT_H_
diff --git a/chrome/browser/chromeos/dbus/session_manager_client.cc b/chromeos/dbus/session_manager_client.cc
index e106a0a..b96d2ad 100644
--- a/chrome/browser/chromeos/dbus/session_manager_client.cc
+++ b/chromeos/dbus/session_manager_client.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/session_manager_client.h"
+#include "chromeos/dbus/session_manager_client.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
diff --git a/chrome/browser/chromeos/dbus/session_manager_client.h b/chromeos/dbus/session_manager_client.h
index a787fad..c6903f9 100644
--- a/chrome/browser/chromeos/dbus/session_manager_client.h
+++ b/chromeos/dbus/session_manager_client.h
@@ -2,12 +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_SESSION_MANAGER_CLIENT_H_
-#define CHROME_BROWSER_CHROMEOS_DBUS_SESSION_MANAGER_CLIENT_H_
+#ifndef CHROMEOS_DBUS_SESSION_MANAGER_CLIENT_H_
+#define CHROMEOS_DBUS_SESSION_MANAGER_CLIENT_H_
 
 #include "base/callback.h"
 #include "base/observer_list.h"
-#include "chrome/browser/chromeos/dbus/dbus_client_implementation_type.h"
+#include "chromeos/chromeos_export.h"
+#include "chromeos/dbus/dbus_client_implementation_type.h"
 
 #include <string>
 
@@ -18,7 +19,7 @@ class Bus;
 namespace chromeos {
 
 // SessionManagerClient is used to communicate with the session manager.
-class SessionManagerClient {
+class CHROMEOS_EXPORT SessionManagerClient {
  public:
   // Interface for observing changes from the session manager.
   class Observer {
@@ -97,4 +98,4 @@ class SessionManagerClient {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_DBUS_SESSION_MANAGER_CLIENT_H_
+#endif  // CHROMEOS_DBUS_SESSION_MANAGER_CLIENT_H_
diff --git a/chrome/browser/chromeos/dbus/speech_synthesizer_client.cc b/chromeos/dbus/speech_synthesizer_client.cc
index 352d8c5..a6a850a 100644
--- a/chrome/browser/chromeos/dbus/speech_synthesizer_client.cc
+++ b/chromeos/dbus/speech_synthesizer_client.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/speech_synthesizer_client.h"
+#include "chromeos/dbus/speech_synthesizer_client.h"
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
diff --git a/chrome/browser/chromeos/dbus/speech_synthesizer_client.h b/chromeos/dbus/speech_synthesizer_client.h
index 64c99ab..0ca93dce5 100644
--- a/chrome/browser/chromeos/dbus/speech_synthesizer_client.h
+++ b/chromeos/dbus/speech_synthesizer_client.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_SPEECH_SYNTHESIZER_CLIENT_H_
-#define CHROME_BROWSER_CHROMEOS_DBUS_SPEECH_SYNTHESIZER_CLIENT_H_
+#ifndef CHROMEOS_DBUS_SPEECH_SYNTHESIZER_CLIENT_H_
+#define CHROMEOS_DBUS_SPEECH_SYNTHESIZER_CLIENT_H_
 #pragma once
 
 #include <string>
 
 #include "base/callback.h"
-#include "chrome/browser/chromeos/dbus/dbus_client_implementation_type.h"
+#include "chromeos/chromeos_export.h"
+#include "chromeos/dbus/dbus_client_implementation_type.h"
 
 namespace dbus {
 class Bus;
@@ -20,7 +21,7 @@ namespace chromeos {
 // SpeechSynthesizerClient is used to communicate with the speech synthesizer.
 // All method should be called from the origin thread (UI thread) which
 // initializes the DBusThreadManager instance.
-class SpeechSynthesizerClient {
+class CHROMEOS_EXPORT SpeechSynthesizerClient {
  public:
   // A callback function called when the result of IsSpeaking is ready.
   // The argument indicates if the speech synthesizer is speaking or not.
@@ -65,4 +66,4 @@ class SpeechSynthesizerClient {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_DBUS_SPEECH_SYNTHESIZER_CLIENT_H_
+#endif  // CHROMEOS_DBUS_SPEECH_SYNTHESIZER_CLIENT_H_
diff --git a/chrome/browser/chromeos/dbus/update_engine_client.cc b/chromeos/dbus/update_engine_client.cc
index d5bd858..55f5c68 100644
--- a/chrome/browser/chromeos/dbus/update_engine_client.cc
+++ b/chromeos/dbus/update_engine_client.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/update_engine_client.h"
+#include "chromeos/dbus/update_engine_client.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
diff --git a/chrome/browser/chromeos/dbus/update_engine_client.h b/chromeos/dbus/update_engine_client.h
index 6372ee1..7d1692d 100644
--- a/chrome/browser/chromeos/dbus/update_engine_client.h
+++ b/chromeos/dbus/update_engine_client.h
@@ -2,12 +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_UPDATE_ENGINE_CLIENT_H_
-#define CHROME_BROWSER_CHROMEOS_DBUS_UPDATE_ENGINE_CLIENT_H_
+#ifndef CHROMEOS_DBUS_UPDATE_ENGINE_CLIENT_H_
+#define CHROMEOS_DBUS_UPDATE_ENGINE_CLIENT_H_
 
 #include "base/callback.h"
 #include "base/observer_list.h"
-#include "chrome/browser/chromeos/dbus/dbus_client_implementation_type.h"
+#include "chromeos/chromeos_export.h"
+#include "chromeos/dbus/dbus_client_implementation_type.h"
 
 #include <string>
 
@@ -18,7 +19,7 @@ class Bus;
 namespace chromeos {
 
 // UpdateEngineClient is used to communicate with the update engine.
-class UpdateEngineClient {
+class CHROMEOS_EXPORT UpdateEngineClient {
  public:
   // Edges for state machine
   //    IDLE->CHECKING_FOR_UPDATE
@@ -122,4 +123,4 @@ class UpdateEngineClient {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_DBUS_UPDATE_ENGINE_CLIENT_H_
+#endif  // CHROMEOS_DBUS_UPDATE_ENGINE_CLIENT_H_
author	hashimoto@chromium.org <hashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>	2012-04-06 01:54:36 +0000
committer	hashimoto@chromium.org <hashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>	2012-04-06 01:54:36 +0000
commit	64e199254481d6132c3a7ccdf9b3a743bff86a88 (patch)
tree	c10cdf03cbde8439d1d8a7070a6c7f9fdf10f517
parent	81a476c9ce1088345db02cf1647399d0e673d487 (diff)
download	chromium_src-64e199254481d6132c3a7ccdf9b3a743bff86a88.zip chromium_src-64e199254481d6132c3a7ccdf9b3a743bff86a88.tar.gz chromium_src-64e199254481d6132c3a7ccdf9b3a743bff86a88.tar.bz2