Merged FakedDBusThreadManager with DBusThreadManager.

chrome/browser/chromeos/settings/device_settings_test_helper.cc

 // 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/settings/device_settings_test_helper.h"
 
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/chromeos/ownership/owner_settings_service.h"
 #include "chrome/browser/chromeos/ownership/owner_settings_service_factory.h"
 #include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/chromeos/settings/device_settings_service.h"
 #include "chrome/browser/chromeos/settings/mock_owner_key_util.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
-#include "chromeos/dbus/fake_dbus_thread_manager.h"
 #include "content/public/browser/browser_thread.h"
 
 namespace chromeos {
 
 DeviceSettingsTestHelper::DeviceSettingsTestHelper() {}
 
 DeviceSettingsTestHelper::~DeviceSettingsTestHelper() {}
 
 void DeviceSettingsTestHelper::FlushLoops() {
   // DeviceSettingsService may trigger operations that hop back and forth
@@ skipping 169 matching lines @@
 
 ScopedDeviceSettingsTestHelper::~ScopedDeviceSettingsTestHelper() {
   Flush();
   DeviceSettingsService::Get()->UnsetSessionManager();
   DeviceSettingsService::Shutdown();
 }
 
 DeviceSettingsTestBase::DeviceSettingsTestBase()
     : user_manager_(new FakeUserManager()),
       user_manager_enabler_(user_manager_),
-      owner_key_util_(new MockOwnerKeyUtil()),
-      fake_dbus_thread_manager_(new FakeDBusThreadManager()) {
+      owner_key_util_(new MockOwnerKeyUtil()) {
 }
 
 DeviceSettingsTestBase::~DeviceSettingsTestBase() {
   base::RunLoop().RunUntilIdle();
 }
 
 void DeviceSettingsTestBase::SetUp() {
   // Initialize DBusThreadManager with a stub implementation.
-  chromeos::DBusThreadManager::InitializeForTesting(fake_dbus_thread_manager_);
+  dbus_helper_ = chromeos::DBusThreadManager::InitializeForTesting();
 
   base::RunLoop().RunUntilIdle();
 
   device_policy_.payload().mutable_metrics_enabled()->set_metrics_enabled(
       false);
   owner_key_util_->SetPublicKeyFromPrivateKey(*device_policy_.GetSigningKey());
   device_policy_.Build();
   device_settings_test_helper_.set_policy_blob(device_policy_.GetBlob());
   device_settings_service_.SetSessionManager(&device_settings_test_helper_,
                                              owner_key_util_);
@@ skipping 32 matching lines @@
   }
   OwnerSettingsService* service =
       OwnerSettingsServiceFactory::GetForProfile(profile_.get());
   CHECK(service);
   if (tpm_is_ready)
     service->OnTPMTokenReady();
   OwnerSettingsServiceFactory::GetInstance()->SetUsername(user_id);
 }
 
 }  // namespace chromeos