Merged FakedDBusThreadManager with DBusThreadManager.

chrome/browser/chromeos/policy/enterprise_install_attributes_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/policy/enterprise_install_attributes.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
@@ skipping 29 matching lines @@
 static const char kTestDeviceId[] = "133750519";
 
 class EnterpriseInstallAttributesTest : public testing::Test {
  protected:
   EnterpriseInstallAttributesTest() {}
 
   virtual void SetUp() OVERRIDE {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     ASSERT_TRUE(PathService::OverrideAndCreateIfNeeded(
         chromeos::FILE_INSTALL_ATTRIBUTES, GetTempPath(), true, false));
-    chromeos::DBusThreadManager::InitializeWithStub();
+    chromeos::DBusThreadManager::Initialize();
     install_attributes_.reset(new EnterpriseInstallAttributes(
         chromeos::DBusThreadManager::Get()->GetCryptohomeClient()));
   }
 
   virtual void TearDown() OVERRIDE {
     chromeos::DBusThreadManager::Shutdown();
   }
 
   base::FilePath GetTempPath() const {
     base::FilePath temp_path = base::MakeAbsoluteFilePath(temp_dir_.path());
@@ skipping 217 matching lines @@
       EnterpriseInstallAttributes::kAttrEnterpriseUser, kTestUser));
   ASSERT_TRUE(cryptohome_util::InstallAttributesFinalize());
 
   // Verify that EnterpriseInstallAttributes correctly decodes the stub
   // cache file.
   install_attributes_->ReadCacheFile(GetTempPath());
   EXPECT_EQ(kTestUser, install_attributes_->GetRegistrationUser());
 }
 
 }  // namespace policy