chrome/browser/chromeos/policy/enterprise_install_attributes_unittest.cc - Issue 130613004: Enabled consumer kiosk mode for all.

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/policy/enterprise_install_attributes_unittest.cc

Issue 130613004: Enabled consumer kiosk mode for all. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 10 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/policy/enterprise_install_attributes.cc ('k') | chrome/browser/resources/extensions/chromeos/kiosk_app_list.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/policy/enterprise_install_attributes_unittest.cc

diff --git a/chrome/browser/chromeos/policy/enterprise_install_attributes_unittest.cc b/chrome/browser/chromeos/policy/enterprise_install_attributes_unittest.cc

index b7a6d98179e737ea7a6de6ab9307f83a13cb7daa..87f093f9ed4e7a6ff8a680f082bd4d47ffad2018 100644

--- a/chrome/browser/chromeos/policy/enterprise_install_attributes_unittest.cc

+++ b/chrome/browser/chromeos/policy/enterprise_install_attributes_unittest.cc

@@ -197,12 +197,13 @@ TEST_F(EnterpriseInstallAttributesTest, ConsumerKioskDevice) {

ASSERT_EQ(EnterpriseInstallAttributes::LOCK_SUCCESS,

LockDeviceAndWaitForResult(

std::string(),

- DEVICE_MODE_CONSUMER_KIOSK,

+ DEVICE_MODE_CONSUMER_KIOSK_AUTOLAUNCH,

std::string()));

ASSERT_FALSE(cryptohome_util::InstallAttributesIsFirstInstall());

- EXPECT_EQ(DEVICE_MODE_CONSUMER_KIOSK, install_attributes_.GetMode());

- ASSERT_TRUE(install_attributes_.IsConsumerKioskDevice());

+ EXPECT_EQ(DEVICE_MODE_CONSUMER_KIOSK_AUTOLAUNCH,

+ install_attributes_.GetMode());

+ ASSERT_TRUE(install_attributes_.IsConsumerKioskDeviceWithAutoLaunch());

}

TEST_F(EnterpriseInstallAttributesTest, DeviceLockedFromOlderVersion) {

@@ -249,7 +250,8 @@ TEST_F(EnterpriseInstallAttributesTest, ReadCacheFileForConsumerKiosk) {

ASSERT_EQ(static_cast<int>(blob.size()),

file_util::WriteFile(GetTempPath(), blob.c_str(), blob.size()));

install_attributes_.ReadCacheFile(GetTempPath());

- EXPECT_EQ(DEVICE_MODE_CONSUMER_KIOSK, install_attributes_.GetMode());

+ EXPECT_EQ(DEVICE_MODE_CONSUMER_KIOSK_AUTOLAUNCH,

+ install_attributes_.GetMode());

EXPECT_EQ("", install_attributes_.GetDomain());

EXPECT_EQ("", install_attributes_.GetRegistrationUser());

EXPECT_EQ("", install_attributes_.GetDeviceId());