Merged FakedDBusThreadManager with DBusThreadManager.

chrome/browser/chromeos/policy/power_policy_browsertest.cc

 // Copyright (c) 2013 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 <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 15 matching lines @@
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/policy/profile_policy_connector.h"
 #include "chrome/browser/policy/profile_policy_connector_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chromeos/chromeos_paths.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/dbus/cryptohome_client.h"
-#include "chromeos/dbus/fake_dbus_thread_manager.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/fake_power_manager_client.h"
 #include "chromeos/dbus/fake_session_manager_client.h"
 #include "chromeos/dbus/power_manager/policy.pb.h"
 #include "chromeos/dbus/power_policy_controller.h"
 #include "chromeos/login/user_names.h"
 #include "components/policy/core/common/cloud/cloud_policy_core.h"
 #include "components/policy/core/common/cloud/cloud_policy_store.h"
 #include "components/policy/core/common/cloud/policy_builder.h"
 #include "components/policy/core/common/external_data_fetcher.h"
 #include "components/policy/core/common/mock_policy_service.h"
@@ skipping 123 matching lines @@
   virtual void SetUpOnMainThread() OVERRIDE;
 
   DISALLOW_COPY_AND_ASSIGN(PowerPolicyInSessionBrowserTest);
 };
 
 PowerPolicyBrowserTestBase::PowerPolicyBrowserTestBase()
     : power_manager_client_(NULL) {
 }
 
 void PowerPolicyBrowserTestBase::SetUpInProcessBrowserTestFixture() {
+  DevicePolicyCrosBrowserTest::SetUpInProcessBrowserTestFixture();
   power_manager_client_ = new chromeos::FakePowerManagerClient;
-  fake_dbus_thread_manager()->SetPowerManagerClient(
+  dbus_helper()->SetPowerManagerClient(
       scoped_ptr<chromeos::PowerManagerClient>(power_manager_client_));
 
-  DevicePolicyCrosBrowserTest::SetUpInProcessBrowserTestFixture();
-
   // Initialize device policy.
   InstallOwnerKey();
   MarkAsEnterpriseOwned();
 }
 
 void PowerPolicyBrowserTestBase::SetUpOnMainThread() {
   DevicePolicyCrosBrowserTest::SetUpOnMainThread();
 
   // Initialize user policy.
   InstallUserKey();
@@ skipping 309 matching lines @@
   policy = baseline_policy;
   policy.set_ac_idle_action(power_manager_client_->policy().ac_idle_action());
   policy.set_battery_idle_action(
       power_manager_client_->policy().battery_idle_action());
   policy.set_reason(power_manager_client_->policy().reason());
   EXPECT_EQ(GetDebugString(policy),
             GetDebugString(power_manager_client_->policy()));
 }
 
 }  // namespace policy