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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/browsing_data/browsing_data_remover_unittest.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') | « chrome/browser/apps/app_browsertest.cc ('k') | chrome/browser/chromeos/chrome_browser_main_chromeos.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/browsing_data/browsing_data_remover_unittest.cc
diff --git a/chrome/browser/browsing_data/browsing_data_remover_unittest.cc b/chrome/browser/browsing_data/browsing_data_remover_unittest.cc
index a5ec397fd09a3b03e317b102ff791e09d4a4b4f3..375ec536e0fa67a97bcfa8dd0798923aa94c1c2e 100644
--- a/chrome/browser/browsing_data/browsing_data_remover_unittest.cc
+++ b/chrome/browser/browsing_data/browsing_data_remover_unittest.cc
@@ -59,7 +59,6 @@
#include "chrome/browser/chromeos/settings/cros_settings.h"
#include "chrome/browser/chromeos/settings/device_settings_service.h"
#include "chromeos/dbus/dbus_thread_manager.h"
-#include "chromeos/dbus/fake_dbus_thread_manager.h"
#include "chromeos/dbus/mock_cryptohome_client.h"
#endif
@@ -1763,13 +1762,12 @@ TEST_F(BrowsingDataRemoverTest, ContentProtectionPlatformKeysRemoval) {
mock_user_manager->SetActiveUser("test@example.com");
chromeos::ScopedUserManagerEnabler user_manager_enabler(mock_user_manager);
- chromeos::FakeDBusThreadManager* fake_dbus_manager =
- new chromeos::FakeDBusThreadManager;
+ scoped_ptr<chromeos::DBusThreadManagerTestHelper> dbus_helper =
+ chromeos::DBusThreadManager::GetDBusThreadManagerTestHelper();
chromeos::MockCryptohomeClient* cryptohome_client =
new chromeos::MockCryptohomeClient;
- fake_dbus_manager->SetCryptohomeClient(
+ dbus_helper->SetCryptohomeClient(
scoped_ptr<chromeos::CryptohomeClient>(cryptohome_client));
- chromeos::DBusThreadManager::InitializeForTesting(fake_dbus_manager);
// Expect exactly one call. No calls means no attempt to delete keys and more
// than one call means a significant performance problem.
« ash/display/projecting_observer_chromeos_unittest.cc ('K') | « chrome/browser/apps/app_browsertest.cc ('k') | chrome/browser/chromeos/chrome_browser_main_chromeos.cc » ('j') | chrome/browser/metrics/chromeos_metrics_provider_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698