Merged FakedDBusThreadManager with DBusThreadManager.

device/nfc/nfc_chromeos_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 "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/values.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
@@ skipping 124 matching lines @@
   std::string peer_identifier_;
   std::string tag_identifier_;
   scoped_refptr<NfcAdapter> adapter_;
 };
 
 }  // namespace
 
 class NfcChromeOSTest : public testing::Test {
  public:
   virtual void SetUp() {
-    DBusThreadManager::InitializeWithStub();
+    DBusThreadManager::Initialize();
     fake_nfc_adapter_client_ = static_cast<FakeNfcAdapterClient*>(
         DBusThreadManager::Get()->GetNfcAdapterClient());
     fake_nfc_device_client_ = static_cast<FakeNfcDeviceClient*>(
         DBusThreadManager::Get()->GetNfcDeviceClient());
     fake_nfc_record_client_ = static_cast<FakeNfcRecordClient*>(
         DBusThreadManager::Get()->GetNfcRecordClient());
     fake_nfc_tag_client_ = static_cast<FakeNfcTagClient*>(
         DBusThreadManager::Get()->GetNfcTagClient());
 
     fake_nfc_adapter_client_->EnablePairingOnPoll(false);
@@ skipping 698 matching lines @@
   EXPECT_TRUE(title->GetString(NfcNdefRecord::kFieldText, &string_value));
   EXPECT_EQ(kText, string_value);
   EXPECT_TRUE(title->GetString(
       NfcNdefRecord::kFieldLanguageCode, &string_value));
   EXPECT_EQ(kLanguageCode, string_value);
   EXPECT_TRUE(title->GetString(NfcNdefRecord::kFieldEncoding, &string_value));
   EXPECT_EQ(kEncoding, string_value);
 }
 
 }  // namespace chromeos