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

Index: chrome/browser/extensions/api/log_private/log_private_apitest_chromeos.cc

diff --git a/chrome/browser/extensions/api/log_private/log_private_apitest_chromeos.cc b/chrome/browser/extensions/api/log_private/log_private_apitest_chromeos.cc

index 4fb9207a65c8f12d1ab0e8fe3718e83bd2880f3d..316a6219021a0dfe0d656872ae750e6b4581fb34 100644

--- a/chrome/browser/extensions/api/log_private/log_private_apitest_chromeos.cc

+++ b/chrome/browser/extensions/api/log_private/log_private_apitest_chromeos.cc

@@ -8,7 +8,7 @@

#include "base/files/file_util.h"

#include "chrome/browser/extensions/extension_apitest.h"

#include "chrome/common/chrome_switches.h"

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

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

#include "chromeos/dbus/fake_debug_daemon_client.h"

#include "content/public/browser/browser_thread.h"

#include "extensions/common/extension_builder.h"

@@ -68,16 +68,11 @@ class LogPrivateApiTest : public ExtensionApiTest {

virtual ~LogPrivateApiTest() {}

virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {

- chromeos::FakeDBusThreadManager* fake_dbus_thread_manager =

- new chromeos::FakeDBusThreadManager;

- fake_dbus_thread_manager->SetFakeClients();

base::FilePath tar_file_path =

test_data_dir_.Append("log_private/dump_logs/system_logs.tar");

- fake_dbus_thread_manager->SetDebugDaemonClient(

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

scoped_ptr<chromeos::DebugDaemonClient>(

new TestDebugDaemonClient(tar_file_path)));

- chromeos::DBusThreadManager::SetInstanceForTesting(

- fake_dbus_thread_manager);

ExtensionApiTest::SetUpInProcessBrowserTestFixture();

}