Merged FakedDBusThreadManager with DBusThreadManager.

chrome/browser/chromeos/policy/device_policy_cros_browser_test.cc

 // 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.
 
 #include "chrome/browser/chromeos/policy/device_policy_cros_browser_test.h"
 
 #include <string>
 #include <vector>
 
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/path_service.h"
 #include "base/stl_util.h"
 #include "chrome/browser/chromeos/policy/device_policy_builder.h"
 #include "chrome/browser/chromeos/policy/enterprise_install_attributes.h"
 #include "chrome/common/chrome_paths.h"
 #include "chromeos/chromeos_paths.h"
-#include "chromeos/dbus/fake_dbus_thread_manager.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/fake_session_manager_client.h"
 #include "crypto/rsa_private_key.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::_;
 using ::testing::AnyNumber;
 using ::testing::Return;
 
 namespace policy {
@@ skipping 37 matching lines @@
 void DevicePolicyCrosTestHelper::OverridePaths() {
   // This is usually done by ChromeBrowserMainChromeOS, but some tests
   // use the overridden paths before ChromeBrowserMain starts. Make sure that
   // the paths are overridden before using them.
   base::FilePath user_data_dir;
   ASSERT_TRUE(PathService::Get(chrome::DIR_USER_DATA, &user_data_dir));
   chromeos::RegisterStubPathOverrides(user_data_dir);
 }
 
 DevicePolicyCrosBrowserTest::DevicePolicyCrosBrowserTest()
-    : fake_dbus_thread_manager_(new chromeos::FakeDBusThreadManager),
-      fake_session_manager_client_(new chromeos::FakeSessionManagerClient) {
-  fake_dbus_thread_manager_->SetFakeClients();
-  fake_dbus_thread_manager_->SetSessionManagerClient(
-      scoped_ptr<chromeos::SessionManagerClient>(fake_session_manager_client_));
+    : fake_session_manager_client_(new chromeos::FakeSessionManagerClient) {
 }
 
 DevicePolicyCrosBrowserTest::~DevicePolicyCrosBrowserTest() {
 }
 
 void DevicePolicyCrosBrowserTest::SetUpInProcessBrowserTestFixture() {
-  chromeos::DBusThreadManager::SetInstanceForTesting(fake_dbus_thread_manager_);
+  dbus_setter_ = chromeos::DBusThreadManager::GetSetterForTesting();
+  dbus_setter_->SetSessionManagerClient(
+      scoped_ptr<chromeos::SessionManagerClient>(fake_session_manager_client_));
   InProcessBrowserTest::SetUpInProcessBrowserTestFixture();
 }
 
 void DevicePolicyCrosBrowserTest::TearDownInProcessBrowserTestFixture() {
   InProcessBrowserTest::TearDownInProcessBrowserTestFixture();
 }
 
 void DevicePolicyCrosBrowserTest::MarkAsEnterpriseOwned() {
   test_helper_.MarkAsEnterpriseOwned();
 }
 
 void DevicePolicyCrosBrowserTest::InstallOwnerKey() {
   test_helper_.InstallOwnerKey();
 }
 
 void DevicePolicyCrosBrowserTest::RefreshDevicePolicy() {
   // Reset the key to its original state.
   device_policy()->SetDefaultSigningKey();
   device_policy()->Build();
   session_manager_client()->set_device_policy(device_policy()->GetBlob());
   session_manager_client()->OnPropertyChangeComplete(true);
 }
 
 }  // namespace policy