chrome/browser/chromeos/power/peripheral_battery_observer_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/power/peripheral_battery_observer_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/power_policy_browsertest.cc ('k') | chrome/browser/chromeos/power/power_data_collector_unittest.cc » ('j') | chromeos/dbus/dbus_client_bundle.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/power/peripheral_battery_observer_browsertest.cc

diff --git a/chrome/browser/chromeos/power/peripheral_battery_observer_browsertest.cc b/chrome/browser/chromeos/power/peripheral_battery_observer_browsertest.cc

index 27c72181dbff71f96035726157d460d9ff6f987e..5b0935d66398f341b5cd82c87e874cc0aa6c099a 100644

--- a/chrome/browser/chromeos/power/peripheral_battery_observer_browsertest.cc

+++ b/chrome/browser/chromeos/power/peripheral_battery_observer_browsertest.cc

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

#include "chrome/browser/browser_process.h"

#include "chrome/browser/notifications/notification_ui_manager.h"

#include "chrome/test/base/in_process_browser_test.h"

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

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

#include "content/public/test/test_utils.h"

#include "testing/gmock/include/gmock/gmock.h"

#include "testing/gtest/include/gtest/gtest.h"

@@ -35,10 +35,7 @@ class PeripheralBatteryObserverTest : public InProcessBrowserTest {

virtual ~PeripheralBatteryObserverTest() {}

virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {

- FakeDBusThreadManager* fake_dbus_thread_manager =

- new FakeDBusThreadManager;

- fake_dbus_thread_manager->SetFakeClients();

- DBusThreadManager::SetInstanceForTesting(fake_dbus_thread_manager);

+ chromeos::DBusThreadManager::Initialize();

InProcessBrowserTest::SetUpInProcessBrowserTestFixture();

}