Merged FakedDBusThreadManager with DBusThreadManager.

chrome/browser/chromeos/policy/device_policy_cros_browser_test.h

 // Copyright (c) 2013 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_POLICY_DEVICE_POLICY_CROS_BROWSER_TEST_H_
 #define CHROME_BROWSER_CHROMEOS_POLICY_DEVICE_POLICY_CROS_BROWSER_TEST_H_
 
 #include "base/basictypes.h"
 #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;
 }
 
 namespace policy {
 
 class DevicePolicyCrosTestHelper {
  public:
   DevicePolicyCrosTestHelper();
@@ skipping 32 matching lines @@
   // affect CrosSettings only.
   void MarkAsEnterpriseOwned();
 
   // Writes the owner key to disk. To be called before installing a policy.
   void InstallOwnerKey();
 
   // Reinstalls |device_policy_| as the policy (to be used when it was
   // 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() {
     return fake_session_manager_client_;
   }
 
   DevicePolicyBuilder* device_policy() { return test_helper_.device_policy(); }
 
  private:
   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);
 };
 
 }  // namespace policy
 
 #endif  // CHROME_BROWSER_CHROMEOS_POLICY_DEVICE_POLICY_CROS_BROWSER_TEST_H_