Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(200)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/apps/app_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
« ash/display/projecting_observer_chromeos_unittest.cc ('K') | « athena/test/athena_test_helper.cc ('k') | chrome/browser/browsing_data/browsing_data_remover_unittest.cc » ('j') | chrome/browser/metrics/chromeos_metrics_provider_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/apps/app_browsertest.cc
diff --git a/chrome/browser/apps/app_browsertest.cc b/chrome/browser/apps/app_browsertest.cc
index f727059771d28bfc5463624d7d4bf4987e75b410..8a0ca9b72e0d1d189c831ccfa9fc297b24ff28b8 100644
--- a/chrome/browser/apps/app_browsertest.cc
+++ b/chrome/browser/apps/app_browsertest.cc
@@ -52,7 +52,6 @@
#include "chrome/browser/chromeos/login/users/mock_user_manager.h"
#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chromeos/dbus/dbus_thread_manager.h"
-#include "chromeos/dbus/fake_dbus_thread_manager.h"
#include "chromeos/dbus/fake_power_manager_client.h"
#endif
@@ -1230,13 +1229,10 @@ class RestartDeviceTest : public PlatformAppBrowserTest {
virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
PlatformAppBrowserTest::SetUpInProcessBrowserTestFixture();
- 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::SetInstanceForTesting(dbus_manager);
+ chromeos::DBusThreadManager::GetDBusThreadManagerTestHelper()->
+ SetPowerManagerClient(
+ scoped_ptr<chromeos::PowerManagerClient>(power_manager_client_));
}
virtual void SetUpOnMainThread() OVERRIDE {
« ash/display/projecting_observer_chromeos_unittest.cc ('K') | « athena/test/athena_test_helper.cc ('k') | chrome/browser/browsing_data/browsing_data_remover_unittest.cc » ('j') | chrome/browser/metrics/chromeos_metrics_provider_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698