Merged FakedDBusThreadManager with DBusThreadManager.

athena/test/athena_test_helper.cc

 // Copyright 2014 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 "athena/test/athena_test_helper.h"
 
 #include "athena/extensions/public/extensions_delegate.h"
 #include "athena/main/athena_launcher.h"
 #include "athena/screen/public/screen_manager.h"
 #include "athena/test/sample_activity_factory.h"
@@ skipping 42 matching lines @@
 void AthenaTestHelper::SetUp(ui::ContextFactory* context_factory) {
   setup_called_ = true;
   file_thread_.reset(new base::Thread("FileThread"));
   base::Thread::Options options(base::MessageLoop::TYPE_IO, 0);
   file_thread_->StartWithOptions(options);
 
   // Force showing in the experimental app-list view.
   base::CommandLine::ForCurrentProcess()->AppendSwitch(
       app_list::switches::kEnableExperimentalAppList);
 
-  chromeos::DBusThreadManager::InitializeWithStub();
+  chromeos::DBusThreadManager::Initialize();
 
   aura::Env::CreateInstance(true);
   aura::Env::GetInstance()->set_context_factory(context_factory);
 
   // Unit tests generally don't want to query the system, rather use the state
   // from RootWindow.
   aura::test::EnvTestHelper(aura::Env::GetInstance())
       .SetInputStateLookup(scoped_ptr<aura::InputStateLookup>());
 
   ui::InitializeInputMethodForTesting();
@@ skipping 55 matching lines @@
 
 void AthenaTestHelper::RunAllPendingInMessageLoop() {
   // TODO(jbates) crbug.com/134753 Find quitters of this RunLoop and have them
   //              use run_loop.QuitClosure().
   base::RunLoop run_loop;
   run_loop.RunUntilIdle();
 }
 
 }  // namespace test
 }  // namespace athena