chrome/browser/chromeos/policy/device_status_collector_browsertest.cc - Issue 477663004: Merged FakedDBusThreadManager with DBusThreadManager.

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/chromeos/policy/device_status_collector_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

« no previous file with comments | « chrome/browser/chromeos/policy/device_policy_cros_browser_test.cc ('k') | chrome/browser/chromeos/policy/enterprise_install_attributes_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/policy/device_status_collector_browsertest.cc

diff --git a/chrome/browser/chromeos/policy/device_status_collector_browsertest.cc b/chrome/browser/chromeos/policy/device_status_collector_browsertest.cc

index 215f6ec7195073d8e209812cb752d5ede236a7bc..9e1137d96a7e5e308f2b8e84191c3ac35a8c974d 100644

--- a/chrome/browser/chromeos/policy/device_status_collector_browsertest.cc

+++ b/chrome/browser/chromeos/policy/device_status_collector_browsertest.cc

@@ -709,7 +709,7 @@ class DeviceStatusCollectorNetworkInterfacesTest

: public DeviceStatusCollectorTest {

protected:

virtual void SetUp() OVERRIDE {

- chromeos::DBusThreadManager::InitializeWithStub();

+ chromeos::DBusThreadManager::Initialize();

chromeos::NetworkHandler::Initialize();

chromeos::ShillDeviceClient::TestInterface* test_device_client =

chromeos::DBusThreadManager::Get()->GetShillDeviceClient()->