Merged FakedDBusThreadManager with DBusThreadManager.

chromeos/disks/disk_mount_manager_unittest.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 "base/bind.h"
 #include "base/message_loop/message_loop.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/fake_cros_disks_client.h"
-#include "chromeos/dbus/fake_dbus_thread_manager.h"
 #include "chromeos/disks/disk_mount_manager.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using chromeos::disks::DiskMountManager;
 using chromeos::CrosDisksClient;
 using chromeos::DBusThreadManager;
 using chromeos::FakeCrosDisksClient;
-using chromeos::FakeDBusThreadManager;
 using testing::_;
 using testing::Field;
 using testing::InSequence;
 
 namespace {
 
 // Holds information needed to create a DiskMountManager::Disk instance.
 struct TestDiskInfo {
   const char* source_path;
   const char* mount_path;
@@ skipping 88 matching lines @@
 
 class DiskMountManagerTest : public testing::Test {
  public:
   DiskMountManagerTest() {}
   virtual ~DiskMountManagerTest() {}
 
   // Sets up test dbus tread manager and disks mount manager.
   // Initializes disk mount manager disks and mount points.
   // Adds a test observer to the disk mount manager.
   virtual void SetUp() {
-    FakeDBusThreadManager* fake_thread_manager = new FakeDBusThreadManager();
     fake_cros_disks_client_ = new FakeCrosDisksClient;
-    fake_thread_manager->SetCrosDisksClient(
+    DBusThreadManager::GetSetterForTesting()->SetCrosDisksClient(
         scoped_ptr<CrosDisksClient>(fake_cros_disks_client_));
 
-    DBusThreadManager::InitializeForTesting(fake_thread_manager);
-
     DiskMountManager::Initialize();
 
     InitDisksAndMountPoints();
 
     DiskMountManager::GetInstance()->AddObserver(&observer_);
   }
 
   // Shuts down dbus thread manager and disk moutn manager used in the test.
   virtual void TearDown() {
     DiskMountManager::GetInstance()->RemoveObserver(&observer_);
@@ skipping 430 matching lines @@
   EXPECT_EQ("/device/source_path",
             fake_cros_disks_client_->last_format_device_path());
   EXPECT_EQ("vfat", fake_cros_disks_client_->last_format_filesystem());
 
   // Simulate cros_disks reporting success.
   fake_cros_disks_client_->SendFormatCompletedEvent(
       chromeos::FORMAT_ERROR_NONE, "/device/source_path");
 }
 
 }  // namespace