Merged FakedDBusThreadManager with DBusThreadManager.

chrome/browser/chromeos/settings/device_settings_test_helper.h

Index: chrome/browser/chromeos/settings/device_settings_test_helper.h
diff --git a/chrome/browser/chromeos/settings/device_settings_test_helper.h b/chrome/browser/chromeos/settings/device_settings_test_helper.h
index fc66da9a8679c8ef59c8fb9263d225f58555fff9..9591fa23b5f0e1aeec87318530d3c5fb4e5eef94 100644
--- a/chrome/browser/chromeos/settings/device_settings_test_helper.h
+++ b/chrome/browser/chromeos/settings/device_settings_test_helper.h
@@ -29,7 +29,7 @@ class TestingProfile;
 
 namespace chromeos {
 
-class FakeDBusThreadManager;
+class DBusThreadManagerTestHelper;
 
 // A helper class for tests mocking out session_manager's device settings
 // interface. The pattern is to initialize DeviceSettingsService with the helper
@@ -194,7 +194,7 @@ class DeviceSettingsTestBase : public testing::Test {
   // with the global instance (DeviceSettingsService::Get()).
   DeviceSettingsService device_settings_service_;
 
-  chromeos::FakeDBusThreadManager* fake_dbus_thread_manager_;
+  scoped_ptr<DBusThreadManagerTestHelper> dbus_helper_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DeviceSettingsTestBase);