chrome/browser/extensions/api/system_private/system_private_apitest.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/extensions/api/system_private/system_private_apitest.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/extensions/api/log_private/log_private_apitest_chromeos.cc ('k') | chrome/browser/metrics/chromeos_metrics_provider_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/system_private/system_private_apitest.cc

diff --git a/chrome/browser/extensions/api/system_private/system_private_apitest.cc b/chrome/browser/extensions/api/system_private/system_private_apitest.cc

index f24209546a12ebb2d91d1b569d30fb3b520d8db4..f0f01f8cea376535574bae2ea3f0cafcb9293c03 100644

--- a/chrome/browser/extensions/api/system_private/system_private_apitest.cc

+++ b/chrome/browser/extensions/api/system_private/system_private_apitest.cc

@@ -9,7 +9,7 @@

#include "chrome/common/pref_names.h"

#if defined(OS_CHROMEOS)

-#include "chromeos/dbus/fake_dbus_thread_manager.h"

+#include "chromeos/dbus/dbus_thread_manager.h"

#include "chromeos/dbus/fake_update_engine_client.h"

using chromeos::UpdateEngineClient;

@@ -31,14 +31,9 @@ class GetUpdateStatusApiTest : public ExtensionApiTest {

virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {

ExtensionApiTest::SetUpInProcessBrowserTestFixture();

- chromeos::FakeDBusThreadManager* fake_dbus_thread_manager =

- new chromeos::FakeDBusThreadManager;

- fake_dbus_thread_manager->SetFakeClients();

fake_update_engine_client_ = new chromeos::FakeUpdateEngineClient;

- fake_dbus_thread_manager->SetUpdateEngineClient(

+ chromeos::DBusThreadManager::GetSetterForTesting()->SetUpdateEngineClient(

scoped_ptr<UpdateEngineClient>(fake_update_engine_client_));

- chromeos::DBusThreadManager::SetInstanceForTesting(

- fake_dbus_thread_manager);

}

virtual void TearDownInProcessBrowserTestFixture() OVERRIDE {