chrome/browser/chromeos/login/existing_user_controller_browsertest.cc - Issue 9961014: Add calls to store/retrieve user policy to SessionManagerClient.

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

Issue 9961014: Add calls to store/retrieve user policy to SessionManagerClient. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

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

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

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

index 1d11abb8dd167ca452d724bcbe727ce8d9ed977d..784df4c8f9a256cb772f016f51c60b9159608b02 100644

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

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

@@ -6,8 +6,8 @@

#include "base/compiler_specific.h"

#include "base/memory/scoped_ptr.h"

#include "base/message_loop.h"

-#include "chrome/browser/chromeos/cros/cros_mock.h"

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

+#include "chrome/browser/chromeos/cros/cros_mock.h"

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

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

#include "chrome/browser/chromeos/dbus/mock_dbus_thread_manager.h"

@@ -125,7 +125,7 @@ class ExistingUserControllerTest : public CrosInProcessBrowserTest {

mock_dbus_thread_manager->mock_session_manager_client();

EXPECT_CALL(*mock_session_manager_client, EmitLoginPromptReady())

.Times(1);

- EXPECT_CALL(*mock_session_manager_client, RetrievePolicy(_))

+ EXPECT_CALL(*mock_session_manager_client, RetrieveDevicePolicy(_))

.Times(AnyNumber());

cros_mock_->InitMockCryptohomeLibrary();

« no previous file with comments | « chrome/browser/chromeos/dbus/session_manager_client.cc ('k') | chrome/browser/chromeos/login/login_utils_browsertest.cc » ('j') | no next file with comments »