Merged FakedDBusThreadManager with DBusThreadManager.

chromeos/cryptohome/system_salt_getter_unittest.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 "chromeos/cryptohome/system_salt_getter.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/fake_cryptohome_client.h"
-#include "chromeos/dbus/fake_dbus_thread_manager.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace chromeos {
 namespace {
 
 // Used as a GetSystemSaltCallback.
 void CopySystemSalt(std::string* out_system_salt,
                     const std::string& system_salt) {
   *out_system_salt = system_salt;
 }
 
 class SystemSaltGetterTest : public testing::Test {
  protected:
   SystemSaltGetterTest() : fake_cryptohome_client_(NULL) {}
 
   virtual void SetUp() OVERRIDE {
-    FakeDBusThreadManager* dbus_thread_manager = new FakeDBusThreadManager;
     fake_cryptohome_client_ = new FakeCryptohomeClient;
-    dbus_thread_manager->SetCryptohomeClient(
+    DBusThreadManager::GetSetterForTesting()->SetCryptohomeClient(
         scoped_ptr<CryptohomeClient>(fake_cryptohome_client_));
-    DBusThreadManager::InitializeForTesting(dbus_thread_manager);
 
     EXPECT_FALSE(SystemSaltGetter::IsInitialized());
     SystemSaltGetter::Initialize();
     ASSERT_TRUE(SystemSaltGetter::IsInitialized());
     ASSERT_TRUE(SystemSaltGetter::Get());
   }
 
   virtual void TearDown() OVERRIDE {
     SystemSaltGetter::Shutdown();
     DBusThreadManager::Shutdown();
@@ skipping 16 matching lines @@
   fake_cryptohome_client_->SetServiceIsAvailable(true);
   base::RunLoop().RunUntilIdle();
   const std::string expected_system_salt =
       SystemSaltGetter::ConvertRawSaltToHexString(
           FakeCryptohomeClient::GetStubSystemSalt());
   EXPECT_EQ(expected_system_salt, system_salt);  // System salt is returned.
 }
 
 }  // namespace
 }  // namespace chromeos