Merged FakedDBusThreadManager with DBusThreadManager.

chrome/browser/chromeos/policy/device_cloud_policy_invalidator_unittest.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 "chrome/browser/chromeos/policy/device_cloud_policy_invalidator.h"
 
 #include <string>
 
 #include "base/memory/ref_counted.h"
 #include "base/message_loop/message_loop_proxy.h"
@@ skipping 102 matching lines @@
                           "user@example.com",
                           "device_id",
                           DEVICE_MODE_ENTERPRISE) {
 }
 
 DeviceCloudPolicyInvalidatorTest::~DeviceCloudPolicyInvalidatorTest() {
 }
 
 void DeviceCloudPolicyInvalidatorTest::SetUp() {
   chromeos::SystemSaltGetter::Initialize();
-  chromeos::DBusThreadManager::InitializeWithStub();
+  chromeos::DBusThreadManager::Initialize();
   chromeos::DeviceOAuth2TokenServiceFactory::Initialize();
   TestingBrowserProcess::GetGlobal()->SetSystemRequestContext(
       system_request_context_.get());
   ASSERT_TRUE(profile_manager_.SetUp());
 
   test_device_settings_service_.reset(new
       chromeos::ScopedTestDeviceSettingsService);
   test_cros_settings_.reset(new chromeos::ScopedTestCrosSettings);
   scoped_refptr<chromeos::MockOwnerKeyUtil> owner_key_util(
       new chromeos::MockOwnerKeyUtil);
@@ skipping 388 matching lines @@
   invalidator = GetCloudPolicyInvalidator();
   ASSERT_TRUE(invalidator);
   EXPECT_EQ(GetDeviceInvalidationService(), GetInvalidationService());
 
   // Verify that the invalidator's highest handled invalidation version starts
   // out as 2.
   EXPECT_EQ(2, invalidator->highest_handled_invalidation_version());
 }
 
 }  // namespace policy