chrome/browser/chromeos/login/auth/cryptohome_authenticator_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/chromeos/login/auth/cryptohome_authenticator_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

« no previous file with comments | « chrome/browser/chromeos/customization_document_unittest.cc ('k') | chrome/browser/chromeos/login/crash_restore_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/auth/cryptohome_authenticator_unittest.cc

diff --git a/chrome/browser/chromeos/login/auth/cryptohome_authenticator_unittest.cc b/chrome/browser/chromeos/login/auth/cryptohome_authenticator_unittest.cc

index 8918f93a819bc3959409b868be823ebfd3de445b..5a54d0a0fd486229c61ed675c11f556362cd6678 100644

--- a/chrome/browser/chromeos/login/auth/cryptohome_authenticator_unittest.cc

+++ b/chrome/browser/chromeos/login/auth/cryptohome_authenticator_unittest.cc

@@ -28,8 +28,8 @@

#include "chromeos/chromeos_switches.h"

#include "chromeos/cryptohome/mock_async_method_caller.h"

#include "chromeos/cryptohome/system_salt_getter.h"

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

#include "chromeos/dbus/fake_cryptohome_client.h"

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

#include "chromeos/login/auth/key.h"

#include "chromeos/login/auth/mock_auth_status_consumer.h"

#include "chromeos/login/auth/mock_url_fetchers.h"

@@ -141,11 +141,9 @@ class CryptohomeAuthenticatorTest : public testing::Test {

mock_caller_ = new cryptohome::MockAsyncMethodCaller;

cryptohome::AsyncMethodCaller::InitializeForTesting(mock_caller_);

- FakeDBusThreadManager* fake_dbus_thread_manager = new FakeDBusThreadManager;

fake_cryptohome_client_ = new FakeCryptohomeClient;

- fake_dbus_thread_manager->SetCryptohomeClient(

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

scoped_ptr<CryptohomeClient>(fake_cryptohome_client_));

- DBusThreadManager::InitializeForTesting(fake_dbus_thread_manager);

SystemSaltGetter::Initialize();