chrome/browser/chromeos/login/parallel_authenticator_unittest.cc - Issue 10824112: Move Chrome OS device settings stuff to chrome/browser/chromeos/settings.

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/parallel_authenticator_unittest.cc

Issue 10824112: Move Chrome OS device settings stuff to chrome/browser/chromeos/settings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase. Created 8 years, 5 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/login/parallel_authenticator.cc ('k') | chrome/browser/chromeos/login/session_manager_observer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/parallel_authenticator_unittest.cc

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

index dcb2e87ab9ba845dbc6bbe67532b317fca1925d0..c9f2d14d39b4b49ac813d6d798448105713ecbae 100644

--- a/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc

+++ b/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc

@@ -15,13 +15,13 @@

#include "chrome/browser/chromeos/cros/cros_library.h"

#include "chrome/browser/chromeos/cros/mock_cert_library.h"

#include "chrome/browser/chromeos/cros/mock_cryptohome_library.h"

-#include "chrome/browser/chromeos/cros_settings.h"

#include "chrome/browser/chromeos/cryptohome/mock_async_method_caller.h"

#include "chrome/browser/chromeos/login/mock_login_status_consumer.h"

#include "chrome/browser/chromeos/login/mock_url_fetchers.h"

#include "chrome/browser/chromeos/login/mock_user_manager.h"

#include "chrome/browser/chromeos/login/test_attempt_state.h"

-#include "chrome/browser/chromeos/stub_cros_settings_provider.h"

+#include "chrome/browser/chromeos/settings/cros_settings.h"

+#include "chrome/browser/chromeos/settings/stub_cros_settings_provider.h"

#include "chrome/common/net/gaia/mock_url_fetcher_factory.h"

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

#include "chromeos/dbus/mock_cryptohome_client.h"