Merged FakedDBusThreadManager with DBusThreadManager.

chromeos/cryptohome/system_salt_getter_unittest.cc

Index: chromeos/cryptohome/system_salt_getter_unittest.cc
diff --git a/chromeos/cryptohome/system_salt_getter_unittest.cc b/chromeos/cryptohome/system_salt_getter_unittest.cc
index f1b52306a7c5841c876b82848e8830c1ee995c7c..db6bc7bd3409b7fe63859e069ae6984d1453f728 100644
--- a/chromeos/cryptohome/system_salt_getter_unittest.cc
+++ b/chromeos/cryptohome/system_salt_getter_unittest.cc
@@ -7,8 +7,8 @@
 #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 {
@@ -25,11 +25,9 @@ class SystemSaltGetterTest : public testing::Test {
   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();