Add support for kiosk mode on the client. Make sure the settings are written in the lockbox.

chrome/browser/policy/enterprise_install_attributes_unittest.cc

Index: chrome/browser/policy/enterprise_install_attributes_unittest.cc
diff --git a/chrome/browser/policy/enterprise_install_attributes_unittest.cc b/chrome/browser/policy/enterprise_install_attributes_unittest.cc
index 9d69924dc0f0e81ed2b4f446c5a1a919ddc3e3f2..65553371a555d43f5f024d05d22b15ddc7c45bd1 100644
--- a/chrome/browser/policy/enterprise_install_attributes_unittest.cc
+++ b/chrome/browser/policy/enterprise_install_attributes_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -7,9 +7,16 @@
 #include "chrome/browser/chromeos/cros/cryptohome_library.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+namespace em = enterprise_management;
+
 namespace policy {
 
 static const char kTestUser[] = "test@example.com";
+static const char kTestDomain[] = "example.com";
+static const char kTestDeviceId[] = "133750519";
+
+static const char kAttrEnterpriseOwned[] = "enterprise.owned";
+static const char kAttrEnterpriseUser[] = "enterprise.user";
 
 class EnterpriseInstallAttributesTest : public testing::Test {
  protected:
@@ -23,33 +30,99 @@ class EnterpriseInstallAttributesTest : public testing::Test {
 
 TEST_F(EnterpriseInstallAttributesTest, Lock) {
   EXPECT_EQ(EnterpriseInstallAttributes::LOCK_SUCCESS,
-            install_attributes_.LockDevice(kTestUser));
+            install_attributes_.LockDevice(
+                kTestUser,
+                EnterpriseInstallAttributes::ENTERPRISE_DEVICE,
+                kTestDeviceId));
 
   EXPECT_EQ(EnterpriseInstallAttributes::LOCK_SUCCESS,
-            install_attributes_.LockDevice(kTestUser));
+            install_attributes_.LockDevice(
+                kTestUser,
+                EnterpriseInstallAttributes::ENTERPRISE_DEVICE,
+                kTestDeviceId));
   EXPECT_EQ(EnterpriseInstallAttributes::LOCK_WRONG_USER,
-            install_attributes_.LockDevice("test1@example.com"));
+            install_attributes_.LockDevice(
+                "test1@example.com",
+                EnterpriseInstallAttributes::ENTERPRISE_DEVICE,
+                kTestDeviceId));
 }
 
 TEST_F(EnterpriseInstallAttributesTest, IsEnterpriseDevice) {
   EXPECT_FALSE(install_attributes_.IsEnterpriseDevice());
   ASSERT_EQ(EnterpriseInstallAttributes::LOCK_SUCCESS,
-            install_attributes_.LockDevice(kTestUser));
+            install_attributes_.LockDevice(
+                kTestUser,
+                EnterpriseInstallAttributes::ENTERPRISE_DEVICE,
+                kTestDeviceId));
   EXPECT_TRUE(install_attributes_.IsEnterpriseDevice());
 }
 
 TEST_F(EnterpriseInstallAttributesTest, GetDomain) {
   EXPECT_EQ(std::string(), install_attributes_.GetDomain());
   ASSERT_EQ(EnterpriseInstallAttributes::LOCK_SUCCESS,
-            install_attributes_.LockDevice(kTestUser));
-  EXPECT_EQ("example.com", install_attributes_.GetDomain());
+            install_attributes_.LockDevice(
+                kTestUser,
+                EnterpriseInstallAttributes::ENTERPRISE_DEVICE,
+                kTestDeviceId));
+  EXPECT_EQ(kTestDomain, install_attributes_.GetDomain());
 }
 
 TEST_F(EnterpriseInstallAttributesTest, GetRegistrationUser) {
   EXPECT_EQ(std::string(), install_attributes_.GetRegistrationUser());
   ASSERT_EQ(EnterpriseInstallAttributes::LOCK_SUCCESS,
-            install_attributes_.LockDevice(kTestUser));
+            install_attributes_.LockDevice(
+                kTestUser,
+                EnterpriseInstallAttributes::ENTERPRISE_DEVICE,
+                kTestDeviceId));
+  EXPECT_EQ(kTestUser, install_attributes_.GetRegistrationUser());
+}
+
+TEST_F(EnterpriseInstallAttributesTest, GetDeviceId) {
+  EXPECT_EQ(std::string(), install_attributes_.GetDeviceId());
+  ASSERT_EQ(EnterpriseInstallAttributes::LOCK_SUCCESS,
+            install_attributes_.LockDevice(
+                kTestUser,
+                EnterpriseInstallAttributes::ENTERPRISE_DEVICE,
+                kTestDeviceId));
+  EXPECT_EQ(kTestDeviceId, install_attributes_.GetDeviceId());
+}
+
+TEST_F(EnterpriseInstallAttributesTest, GetMode) {
+  EXPECT_EQ(EnterpriseInstallAttributes::UNKNOWN_DEVICE,
+            install_attributes_.GetMode());
+  ASSERT_EQ(EnterpriseInstallAttributes::LOCK_SUCCESS,
+            install_attributes_.LockDevice(
+                kTestUser,
+                EnterpriseInstallAttributes::KIOSK_DEVICE,
+                kTestDeviceId));
+  EXPECT_EQ(EnterpriseInstallAttributes::KIOSK_DEVICE,
+            install_attributes_.GetMode());
+}
+
+TEST_F(EnterpriseInstallAttributesTest, EndUserDevice) {

[Mattias Nissler (ping if slow), 2012/02/16 10:36:27]

consumer

[pastarmovj, 2012/02/17 13:59:47]

Done.

+  EXPECT_EQ(EnterpriseInstallAttributes::UNKNOWN_DEVICE,
+            install_attributes_.GetMode());
+  // Lock the attributes empty.
+  ASSERT_TRUE(cryptohome_->InstallAttributesFinalize());
+  ASSERT_FALSE(cryptohome_->InstallAttributesIsFirstInstall());
+  EXPECT_EQ(EnterpriseInstallAttributes::END_USER_DEVICE,
+            install_attributes_.GetMode());
+}
+
+TEST_F(EnterpriseInstallAttributesTest, DeviceLockedFromOlderVersion) {
+  EXPECT_EQ(EnterpriseInstallAttributes::UNKNOWN_DEVICE,
+            install_attributes_.GetMode());
+  // Lock the attributes as if it was done from older Chrome version.
+  ASSERT_TRUE(cryptohome_->InstallAttributesSet(kAttrEnterpriseOwned, "true"));
+  ASSERT_TRUE(cryptohome_->InstallAttributesSet(kAttrEnterpriseUser,
+                                                kTestUser));
+  ASSERT_TRUE(cryptohome_->InstallAttributesFinalize());
+  ASSERT_FALSE(cryptohome_->InstallAttributesIsFirstInstall());
+  EXPECT_EQ(EnterpriseInstallAttributes::ENTERPRISE_DEVICE,
+            install_attributes_.GetMode());
+  EXPECT_EQ(kTestDomain, install_attributes_.GetDomain());
   EXPECT_EQ(kTestUser, install_attributes_.GetRegistrationUser());
+  EXPECT_EQ("", install_attributes_.GetDeviceId());
 }
 
 }  // namespace policy