Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1258)

Unified Diff: chrome/browser/chromeos/policy/power_policy_browsertest.cc

Issue 49773003: ChromeOS: Remove MockDBusThreadManager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed tests. Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/policy/power_policy_browsertest.cc
diff --git a/chrome/browser/chromeos/policy/power_policy_browsertest.cc b/chrome/browser/chromeos/policy/power_policy_browsertest.cc
index b1d556c96869ad495f35da5f940eecd292ebe38e..21d038e656552419e7edbfe30703920732f6b87e 100644
--- a/chrome/browser/chromeos/policy/power_policy_browsertest.cc
+++ b/chrome/browser/chromeos/policy/power_policy_browsertest.cc
@@ -151,14 +151,15 @@ PowerPolicyBrowserTestBase::PowerPolicyBrowserTestBase()
}
void PowerPolicyBrowserTestBase::SetUpInProcessBrowserTestFixture() {
+ power_manager_client_ = new chromeos::FakePowerManagerClient;
+ fake_dbus_thread_manager()->SetPowerManagerClient(
+ scoped_ptr<chromeos::PowerManagerClient>(power_manager_client_));
+
DevicePolicyCrosBrowserTest::SetUpInProcessBrowserTestFixture();
// Initialize device policy.
InstallOwnerKey();
MarkAsEnterpriseOwned();
-
- power_manager_client_ =
- fake_dbus_thread_manager()->fake_power_manager_client();
}
void PowerPolicyBrowserTestBase::SetUpOnMainThread() {

Powered by Google App Engine
This is Rietveld 408576698