Enabled consumer kiosk mode for all.

chrome/browser/chromeos/app_mode/kiosk_app_manager_browsertest.cc

 // Copyright 2013 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.
 
 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 16 matching lines @@
 #include "net/base/host_port_pair.h"
 #include "net/dns/mock_host_resolver.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 
 namespace chromeos {
 
 namespace {
 
 const char kWebstoreDomain[] = "cws.com";
 
-// Helper KioskAppManager::GetConsumerKioskModeStatusCallback implementation.
-void ConsumerKioskModeStatusCheck(
-    KioskAppManager::ConsumerKioskModeStatus* out_status,
+// Helper KioskAppManager::GetConsumerKioskAutoLaunchStatusCallback
+// implementation.
+void ConsumerKioskAutoLaunchStatusCheck(
+    KioskAppManager::ConsumerKioskAutoLaunchStatus* out_status,
     const base::Closure& runner_quit_task,
-    KioskAppManager::ConsumerKioskModeStatus in_status) {
-  LOG(INFO) << "ConsumerKioskModeStatus = " << in_status;
+    KioskAppManager::ConsumerKioskAutoLaunchStatus in_status) {
+  LOG(INFO) << "ConsumerKioskAutoLaunchStatus = " << in_status;
   *out_status = in_status;
   runner_quit_task.Run();
 }
 
 // Helper KioskAppManager::EnableKioskModeCallback implementation.
 void ConsumerKioskModeLockCheck(
     bool* out_locked,
     const base::Closure& runner_quit_task,
     bool in_locked) {
-  LOG(INFO) << "kioks locked  = " << in_locked;
+  LOG(INFO) << "kiosk locked  = " << in_locked;
   *out_locked = in_locked;
   runner_quit_task.Run();
 }
 
 // Helper EnterpriseInstallAttributes::LockResultCallback implementation.
 void OnEnterpriseDeviceLock(
     policy::EnterpriseInstallAttributes::LockResult* out_locked,
     const base::Closure& runner_quit_task,
     policy::EnterpriseInstallAttributes::LockResult in_locked) {
   LOG(INFO) << "Enterprise lock  = " << in_locked;
@@ skipping 376 matching lines @@
 
   base::FilePath expected_icon_path;
   ASSERT_TRUE(PathService::Get(chrome::DIR_USER_DATA, &expected_icon_path));
   expected_icon_path = expected_icon_path.
       AppendASCII(KioskAppManager::kIconCacheDir).
       AppendASCII(apps[0].app_id).AddExtension(".png");
   EXPECT_EQ(expected_icon_path.value(), icon_path_string);
 }
 
 IN_PROC_BROWSER_TEST_F(KioskAppManagerTest, EnableConsumerKiosk) {
-  scoped_ptr<KioskAppManager::ConsumerKioskModeStatus> status(
-      new KioskAppManager::ConsumerKioskModeStatus(
-          KioskAppManager::CONSUMER_KIOSK_MODE_DISABLED));
+  scoped_ptr<KioskAppManager::ConsumerKioskAutoLaunchStatus> status(
+      new KioskAppManager::ConsumerKioskAutoLaunchStatus(
+          KioskAppManager::CONSUMER_KIOSK_AUTO_LAUNCH_DISABLED));
   scoped_ptr<bool> locked(new bool(false));
 
   scoped_refptr<content::MessageLoopRunner> runner =
       new content::MessageLoopRunner;
-  manager()->GetConsumerKioskModeStatus(
-      base::Bind(&ConsumerKioskModeStatusCheck,
+  manager()->GetConsumerKioskAutoLaunchStatus(
+      base::Bind(&ConsumerKioskAutoLaunchStatusCheck,
                  status.get(),
                  runner->QuitClosure()));
   runner->Run();
-  EXPECT_EQ(*status.get(), KioskAppManager::CONSUMER_KIOSK_MODE_CONFIGURABLE);
+  EXPECT_EQ(*status.get(),
+            KioskAppManager::CONSUMER_KIOSK_AUTO_LAUNCH_CONFIGURABLE);
 
   scoped_refptr<content::MessageLoopRunner> runner2 =
       new content::MessageLoopRunner;
-  manager()->EnableConsumerModeKiosk(
+  manager()->EnableConsumerKioskAutoLaunch(
       base::Bind(&ConsumerKioskModeLockCheck,
                  locked.get(),
                  runner2->QuitClosure()));
   runner2->Run();
   EXPECT_TRUE(*locked.get());
 
   scoped_refptr<content::MessageLoopRunner> runner3 =
       new content::MessageLoopRunner;
-  manager()->GetConsumerKioskModeStatus(
-      base::Bind(&ConsumerKioskModeStatusCheck,
+  manager()->GetConsumerKioskAutoLaunchStatus(
+      base::Bind(&ConsumerKioskAutoLaunchStatusCheck,
                  status.get(),
                  runner3->QuitClosure()));
   runner3->Run();
-  EXPECT_EQ(*status.get(), KioskAppManager::CONSUMER_KIOSK_MODE_ENABLED);
+  EXPECT_EQ(*status.get(),
+            KioskAppManager::CONSUMER_KIOSK_AUTO_LAUNCH_ENABLED);
 }
 
 IN_PROC_BROWSER_TEST_F(KioskAppManagerTest,
                        PreventEnableConsumerKioskForEnterprise) {
   // First, lock the device as enterprise.
   EXPECT_EQ(LockDeviceForEnterprise(),
             policy::EnterpriseInstallAttributes::LOCK_SUCCESS);
 
-  scoped_ptr<KioskAppManager::ConsumerKioskModeStatus> status(
-      new KioskAppManager::ConsumerKioskModeStatus(
-          KioskAppManager::CONSUMER_KIOSK_MODE_DISABLED));
+  scoped_ptr<KioskAppManager::ConsumerKioskAutoLaunchStatus> status(
+      new KioskAppManager::ConsumerKioskAutoLaunchStatus(
+          KioskAppManager::CONSUMER_KIOSK_AUTO_LAUNCH_DISABLED));
   scoped_ptr<bool> locked(new bool(true));
 
   scoped_refptr<content::MessageLoopRunner> runner =
       new content::MessageLoopRunner;
-  manager()->GetConsumerKioskModeStatus(
-      base::Bind(&ConsumerKioskModeStatusCheck,
+  manager()->GetConsumerKioskAutoLaunchStatus(
+      base::Bind(&ConsumerKioskAutoLaunchStatusCheck,
                  status.get(),
                  runner->QuitClosure()));
   runner->Run();
-  EXPECT_EQ(*status.get(), KioskAppManager::CONSUMER_KIOSK_MODE_DISABLED);
+  EXPECT_EQ(*status.get(),
+            KioskAppManager::CONSUMER_KIOSK_AUTO_LAUNCH_DISABLED);
 
   scoped_refptr<content::MessageLoopRunner> runner2 =
       new content::MessageLoopRunner;
-  manager()->EnableConsumerModeKiosk(
+  manager()->EnableConsumerKioskAutoLaunch(
       base::Bind(&ConsumerKioskModeLockCheck,
                  locked.get(),
                  runner2->QuitClosure()));
   runner2->Run();
   EXPECT_FALSE(*locked.get());
 
   scoped_refptr<content::MessageLoopRunner> runner3 =
       new content::MessageLoopRunner;
-  manager()->GetConsumerKioskModeStatus(
-      base::Bind(&ConsumerKioskModeStatusCheck,
+  manager()->GetConsumerKioskAutoLaunchStatus(
+      base::Bind(&ConsumerKioskAutoLaunchStatusCheck,
                  status.get(),
                  runner3->QuitClosure()));
   runner3->Run();
-  EXPECT_EQ(*status.get(), KioskAppManager::CONSUMER_KIOSK_MODE_DISABLED);
+  EXPECT_EQ(*status.get(),
+            KioskAppManager::CONSUMER_KIOSK_AUTO_LAUNCH_DISABLED);
 }
 
 }  // namespace chromeos