Merged FakedDBusThreadManager with DBusThreadManager.

chrome/browser/chromeos/mobile/mobile_activator_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 "chrome/browser/chromeos/mobile/mobile_activator.h"
 
 #include "base/message_loop/message_loop.h"
 #include "base/values.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/network/network_connection_handler.h"
@@ skipping 96 matching lines @@
   MobileActivatorTest()
       : cellular_network_(string(kTestServicePath)),
         mobile_activator_(&cellular_network_) {
     cellular_network_.PropertyChanged(shill::kTypeProperty,
                                       base::StringValue(shill::kTypeCellular));
   }
   virtual ~MobileActivatorTest() {}
 
  protected:
   virtual void SetUp() {
-    DBusThreadManager::InitializeWithStub();
+    DBusThreadManager::Initialize();
     NetworkHandler::Initialize();
   }
   virtual void TearDown() {
     NetworkHandler::Shutdown();
     DBusThreadManager::Shutdown();
   }
 
   void set_activator_state(const MobileActivator::PlanActivationState state) {
     mobile_activator_.set_state_for_test(state);
   }
@@ skipping 223 matching lines @@
   EXPECT_EQ(MobileActivator::PLAN_ACTIVATION_RECONNECTING,
             mobile_activator_.InvokePickNextState(&cellular_network_,
                                                   &error_description));
   set_activator_state(MobileActivator::PLAN_ACTIVATION_SHOWING_PAYMENT);
   EXPECT_EQ(MobileActivator::PLAN_ACTIVATION_RECONNECTING,
             mobile_activator_.InvokePickNextState(&cellular_network_,
                                                   &error_description));
 }
 
 }  // namespace chromeos