chrome/browser/apps/app_browsertest.cc - Issue 49773003: ChromeOS: Remove MockDBusThreadManager.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/apps/app_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:

Index: chrome/browser/apps/app_browsertest.cc

diff --git a/chrome/browser/apps/app_browsertest.cc b/chrome/browser/apps/app_browsertest.cc

index c87ffd87baae1fd329944f79b11e1bb1291fe9e5..606e32da90a1c0864afb5c779dc901b003745a13 100644

--- a/chrome/browser/apps/app_browsertest.cc

+++ b/chrome/browser/apps/app_browsertest.cc

@@ -1228,8 +1228,11 @@ class RestartDeviceTest : public PlatformAppBrowserTest {

chromeos::FakeDBusThreadManager* dbus_manager =

new chromeos::FakeDBusThreadManager;

+ dbus_manager->SetFakeClients();

+ power_manager_client_ = new chromeos::FakePowerManagerClient;

+ dbus_manager->SetPowerManagerClient(

+ scoped_ptr<chromeos::PowerManagerClient>(power_manager_client_));

chromeos::DBusThreadManager::InitializeForTesting(dbus_manager);

- power_manager_client_ = dbus_manager->fake_power_manager_client();

}

virtual void SetUpOnMainThread() OVERRIDE {

« no previous file with comments | « no previous file | chrome/browser/browsing_data/browsing_data_remover_unittest.cc » ('j') | no next file with comments »