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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 477663004: Merged FakedDBusThreadManager with DBusThreadManager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 months 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
« chrome/browser/chromeos/policy/device_policy_cros_browser_test.h ('K') | « chrome/browser/chromeos/policy/enterprise_install_attributes_unittest.cc ('k') | chrome/browser/chromeos/power/peripheral_battery_observer_browsertest.cc » ('j') | chromeos/dbus/dbus_client_bundle.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 4957f45955424d1e596924f15a1a2e48acdfd5b0..ba080f717b30827ad7079a8436232746d920c8c6 100644
--- a/chrome/browser/chromeos/policy/power_policy_browsertest.cc
+++ b/chrome/browser/chromeos/policy/power_policy_browsertest.cc
@@ -33,7 +33,7 @@
#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"
@@ -177,12 +177,11 @@ PowerPolicyBrowserTestBase::PowerPolicyBrowserTestBase()
}
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();
« chrome/browser/chromeos/policy/device_policy_cros_browser_test.h ('K') | « chrome/browser/chromeos/policy/enterprise_install_attributes_unittest.cc ('k') | chrome/browser/chromeos/power/peripheral_battery_observer_browsertest.cc » ('j') | chromeos/dbus/dbus_client_bundle.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698