Merged FakedDBusThreadManager with DBusThreadManager.

chrome/test/base/testing_io_thread_state.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 "chrome/test/base/testing_io_thread_state.h"
 
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/run_loop.h"
 #include "base/time/tick_clock.h"
 #include "chrome/browser/io_thread.h"
@@ skipping 22 matching lines @@
   }
 }
 
 }  // namespace
 
 namespace chrome {
 
 TestingIOThreadState::TestingIOThreadState() {
 #if defined(OS_CHROMEOS)
   // Needed by IOThread constructor.
-  chromeos::DBusThreadManager::InitializeWithStub();
+  chromeos::DBusThreadManager::Initialize();
   chromeos::NetworkHandler::Initialize();
 #endif
 
   io_thread_state_.reset(
       new IOThread(TestingBrowserProcess::GetGlobal()->local_state(),
                    TestingBrowserProcess::GetGlobal()->policy_service(),
                    NULL, NULL));
 
   // Safe because there are no virtuals.
   base::RunLoop run_loop;
@@ skipping 34 matching lines @@
 
 void TestingIOThreadState::Shutdown(const base::Closure& done) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   delete io_thread_state_->globals();
   io_thread_state_->SetGlobalsForTesting(NULL);
   done.Run();
 }
 
 }  // namespace chrome