chrome/browser/browsing_data/browsing_data_remover_unittest.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/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:

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 f0c0d5cef2d6e043baff95b09feefca72eae7917..9aa96538eb060ff418bbecf66e30124db0cc3330 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

@@ -1765,13 +1764,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::DBusThreadManagerSetter> dbus_setter =

+ chromeos::DBusThreadManager::GetSetterForTesting();

chromeos::MockCryptohomeClient* cryptohome_client =

new chromeos::MockCryptohomeClient;

- fake_dbus_manager->SetCryptohomeClient(

+ dbus_setter->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.