Merged FakedDBusThreadManager with DBusThreadManager.

chrome/browser/chromeos/proxy_config_service_impl_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/proxy_config_service_impl.h"
 
 #include <vector>
 
 #include "base/format_macros.h"
 #include "base/json/json_writer.h"
@@ skipping 197 matching lines @@
 
 }  // namespace
 
 class ProxyConfigServiceImplTest : public testing::Test {
  protected:
   ProxyConfigServiceImplTest()
       : ui_thread_(BrowserThread::UI, &loop_),
         io_thread_(BrowserThread::IO, &loop_) {}
 
   virtual void SetUp() {
-    DBusThreadManager::InitializeWithStub();
+    DBusThreadManager::Initialize();
     NetworkHandler::Initialize();
 
     SetUpNetwork();
 
     PrefProxyConfigTrackerImpl::RegisterPrefs(pref_service_.registry());
 
     // Create a ProxyConfigServiceImpl like for the system request context.
     config_service_impl_.reset(
         new ProxyConfigServiceImpl(NULL,  // no profile prefs
                                    &pref_service_));
@@ skipping 216 matching lines @@
     pref_service_.RemoveRecommendedPref(prefs::kProxy);
     SyncGetLatestProxyConfig(&actual_config);
     EXPECT_EQ(network_params.auto_detect, actual_config.auto_detect());
     EXPECT_EQ(network_params.pac_url, actual_config.pac_url());
     EXPECT_TRUE(network_params.proxy_rules.Matches(
         actual_config.proxy_rules()));
   }
 }
 
 }  // namespace chromeos