chrome/browser/chromeos/login/existing_user_controller_browsertest.cc - Issue 14306004: Put Kiosk App parameters into device 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/existing_user_controller_browsertest.cc

Issue 14306004: Put Kiosk App parameters into device settings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase. Created 7 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/login/existing_user_controller_auto_login_unittest.cc ('k') | chrome/browser/chromeos/login/user_manager_impl.h » ('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 896bc47f03cbaf955303d732bb92f6023dda52da..63539fd41b9bfe090f4bf4fb5147a0f96b5cfae8 100644

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

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

@@ -55,7 +55,6 @@

#include "testing/gtest/include/gtest/gtest.h"

#include "ui/base/l10n/l10n_util.h"

-using ::testing::_;

using ::testing::AnyNumber;

using ::testing::Invoke;

using ::testing::InvokeWithoutArgs;

@@ -63,6 +62,7 @@ using ::testing::Return;

using ::testing::ReturnNull;

using ::testing::Sequence;

using ::testing::WithArg;

+using ::testing::_;

namespace em = enterprise_management;

@@ -469,8 +469,11 @@ class ExistingUserControllerPublicSessionTest

// Setup the device policy.

em::ChromeDeviceSettingsProto& proto(device_policy()->payload());

- proto.mutable_device_local_accounts()->add_account()->set_id(

- kAutoLoginUsername);

+ em::DeviceLocalAccountInfoProto* account =

+ proto.mutable_device_local_accounts()->add_account();

+ account->set_account_id(kAutoLoginUsername);

+ account->set_type(

+ em::DeviceLocalAccountInfoProto::ACCOUNT_TYPE_PUBLIC_SESSION);

RefreshDevicePolicy();

// Setup the device local account policy.