Enabled consumer kiosk mode for all.

chrome/browser/chromeos/app_mode/kiosk_app_manager_browsertest.cc

Index: chrome/browser/chromeos/app_mode/kiosk_app_manager_browsertest.cc
diff --git a/chrome/browser/chromeos/app_mode/kiosk_app_manager_browsertest.cc b/chrome/browser/chromeos/app_mode/kiosk_app_manager_browsertest.cc
index 4b87ffdb446188f5a071212e127c3b0194ddda4b..a46006cf86f0f1d735888ec385f9ebed8951805e 100644
--- a/chrome/browser/chromeos/app_mode/kiosk_app_manager_browsertest.cc
+++ b/chrome/browser/chromeos/app_mode/kiosk_app_manager_browsertest.cc
@@ -34,12 +34,13 @@ 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();
 }
@@ -446,23 +447,24 @@ IN_PROC_BROWSER_TEST_F(KioskAppManagerTest, GoodApp) {
 }
 
 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()->EnableConsumerModeKioskAutoStart(
       base::Bind(&ConsumerKioskModeLockCheck,
                  locked.get(),
                  runner2->QuitClosure()));
@@ -471,12 +473,13 @@ IN_PROC_BROWSER_TEST_F(KioskAppManagerTest, EnableConsumerKiosk) {
 
   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,
@@ -485,23 +488,24 @@ IN_PROC_BROWSER_TEST_F(KioskAppManagerTest,
   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()->EnableConsumerModeKioskAutoStart(
       base::Bind(&ConsumerKioskModeLockCheck,
                  locked.get(),
                  runner2->QuitClosure()));
@@ -510,12 +514,13 @@ IN_PROC_BROWSER_TEST_F(KioskAppManagerTest,
 
   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