Merged FakedDBusThreadManager with DBusThreadManager.

chrome/browser/chromeos/login/crash_restore_browsertest.cc

 // Copyright 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 <string>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/memory/ref_counted.h"
 #include "base/run_loop.h"
 #include "chrome/browser/chromeos/login/session/user_session_manager.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/dbus/cryptohome_client.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 "chromeos/dbus/session_manager_client.h"
 #include "components/user_manager/user.h"
 #include "components/user_manager/user_manager.h"
 #include "content/public/test/test_utils.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace chromeos {
 
@@ skipping 13 matching lines @@
 
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     command_line->AppendSwitchASCII(switches::kLoginUser, kUserId1);
     command_line->AppendSwitchASCII(
         switches::kLoginProfile,
         CryptohomeClient::GetStubSanitizedUsername(kUserId1));
   }
 
   virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
     // Redirect session_manager DBus calls to FakeSessionManagerClient.
-    FakeDBusThreadManager* dbus_thread_manager = new FakeDBusThreadManager;
-    dbus_thread_manager->SetFakeClients();
     session_manager_client_ = new FakeSessionManagerClient;
-    dbus_thread_manager->SetSessionManagerClient(
+    chromeos::DBusThreadManager::GetSetterForTesting()->SetSessionManagerClient(
         scoped_ptr<SessionManagerClient>(session_manager_client_));
-    DBusThreadManager::SetInstanceForTesting(dbus_thread_manager);
     session_manager_client_->StartSession(kUserId1);
   }
 
   FakeSessionManagerClient* session_manager_client_;
 };
 
 IN_PROC_BROWSER_TEST_F(CrashRestoreSimpleTest, RestoreSessionForOneUser) {
   user_manager::UserManager* user_manager = user_manager::UserManager::Get();
   user_manager::User* user = user_manager->GetActiveUser();
   ASSERT_TRUE(user);
@@ skipping 82 matching lines @@
             users[0]->username_hash());
   EXPECT_EQ(kUserId2, users[1]->email());
   EXPECT_EQ(CryptohomeClient::GetStubSanitizedUsername(kUserId2),
             users[1]->username_hash());
   EXPECT_EQ(kUserId1, users[2]->email());
   EXPECT_EQ(CryptohomeClient::GetStubSanitizedUsername(kUserId1),
             users[2]->username_hash());
 }
 
 }  // namespace chromeos