Merged FakedDBusThreadManager with DBusThreadManager.

chrome/browser/chromeos/policy/device_policy_cros_browser_test.h

Index: chrome/browser/chromeos/policy/device_policy_cros_browser_test.h
diff --git a/chrome/browser/chromeos/policy/device_policy_cros_browser_test.h b/chrome/browser/chromeos/policy/device_policy_cros_browser_test.h
index 1547504082064067dcc491e3156c59c42965c954..ebf8b71d07219a30cda4f0fbb07c782827942960 100644
--- a/chrome/browser/chromeos/policy/device_policy_cros_browser_test.h
+++ b/chrome/browser/chromeos/policy/device_policy_cros_browser_test.h
@@ -9,7 +9,7 @@
 #include "base/compiler_specific.h"
 #include "chrome/browser/chromeos/policy/device_policy_builder.h"
 #include "chrome/test/base/in_process_browser_test.h"
-#include "chromeos/dbus/fake_dbus_thread_manager.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
 
 namespace chromeos {
 class FakeSessionManagerClient;
@@ -62,8 +62,8 @@ class DevicePolicyCrosBrowserTest : public InProcessBrowserTest {
   // recently changed).
   void RefreshDevicePolicy();
 
-  chromeos::FakeDBusThreadManager* fake_dbus_thread_manager() {
-    return fake_dbus_thread_manager_;
+  chromeos::DBusThreadManagerSetter* dbus_helper() {

[hashimoto, 2014/08/26 01:54:59]

nit: dbus_setter

[zel, 2014/08/26 17:50:45]

Done.

+    return dbus_setter_.get();
   }
 
   chromeos::FakeSessionManagerClient* session_manager_client() {
@@ -76,7 +76,7 @@ class DevicePolicyCrosBrowserTest : public InProcessBrowserTest {
   DevicePolicyCrosTestHelper test_helper_;
 
   // FakeDBusThreadManager uses FakeSessionManagerClient.
-  chromeos::FakeDBusThreadManager* fake_dbus_thread_manager_;
+  scoped_ptr<chromeos::DBusThreadManagerSetter> dbus_setter_;
   chromeos::FakeSessionManagerClient* fake_session_manager_client_;
 
   DISALLOW_COPY_AND_ASSIGN(DevicePolicyCrosBrowserTest);