Enabled consumer kiosk mode for all.

chrome/browser/chromeos/login/kiosk_browsertest.cc

Index: chrome/browser/chromeos/login/kiosk_browsertest.cc
diff --git a/chrome/browser/chromeos/login/kiosk_browsertest.cc b/chrome/browser/chromeos/login/kiosk_browsertest.cc
index 080d94fd627abf97db83490fd7ba9507d69ef8d8..12fc12039b0bcdcee0531a764fc95d23d7e8e578 100644
--- a/chrome/browser/chromeos/login/kiosk_browsertest.cc
+++ b/chrome/browser/chromeos/login/kiosk_browsertest.cc
@@ -71,18 +71,18 @@ const char kTestClientId[] = "fake-client-id";
 const char kTestAppScope[] =
     "https://www.googleapis.com/auth/userinfo.profile";
 
-// Helper function for GetConsumerKioskModeStatusCallback.
-void ConsumerKioskModeStatusCheck(
-    KioskAppManager::ConsumerKioskModeStatus* out_status,
+// Helper function for GetConsumerKioskAutoLaunchStatusCallback.
+void ConsumerKioskAutoLaunchStatusCheck(
+    KioskAppManager::ConsumerKioskAutoLaunchStatus* out_status,
     const base::Closure& runner_quit_task,
-    KioskAppManager::ConsumerKioskModeStatus in_status) {
+    KioskAppManager::ConsumerKioskAutoLaunchStatus in_status) {
   LOG(INFO) << "KioskAppManager::ConsumerKioskModeStatus = " << in_status;
   *out_status = in_status;
   runner_quit_task.Run();
 }
 
 // Helper KioskAppManager::EnableKioskModeCallback implementation.
-void ConsumerKioskModeLockCheck(
+void ConsumerKioskModeAutoStartLockCheck(
     bool* out_locked,
     const base::Closure& runner_quit_task,
     bool in_locked) {
@@ -345,25 +345,27 @@ class KioskTest : public OobeBaseTest {
     scoped_ptr<bool> locked(new bool(false));
     scoped_refptr<content::MessageLoopRunner> runner =
         new content::MessageLoopRunner;
-    KioskAppManager::Get()->EnableConsumerModeKiosk(
-        base::Bind(&ConsumerKioskModeLockCheck,
+    KioskAppManager::Get()->EnableConsumerModeKioskAutoStart(
+        base::Bind(&ConsumerKioskModeAutoStartLockCheck,
                    locked.get(),
                    runner->QuitClosure()));
     runner->Run();
     EXPECT_TRUE(*locked.get());
   }
 
-  KioskAppManager::ConsumerKioskModeStatus GetConsumerKioskModeStatus() {
-    KioskAppManager::ConsumerKioskModeStatus status =
-        static_cast<KioskAppManager::ConsumerKioskModeStatus>(-1);
+  KioskAppManager::ConsumerKioskAutoLaunchStatus
+  GetConsumerKioskModeStatus() {
+    KioskAppManager::ConsumerKioskAutoLaunchStatus status =
+        static_cast<KioskAppManager::ConsumerKioskAutoLaunchStatus>(-1);
     scoped_refptr<content::MessageLoopRunner> runner =
         new content::MessageLoopRunner;
-    KioskAppManager::Get()->GetConsumerKioskModeStatus(
-        base::Bind(&ConsumerKioskModeStatusCheck,
+    KioskAppManager::Get()->GetConsumerKioskAutoLaunchStatus(
+        base::Bind(&ConsumerKioskAutoLaunchStatusCheck,
                    &status,
                    runner->QuitClosure()));
     runner->Run();
-    CHECK_NE(status, static_cast<KioskAppManager::ConsumerKioskModeStatus>(-1));
+    CHECK_NE(status,
+             static_cast<KioskAppManager::ConsumerKioskAutoLaunchStatus>(-1));
     return status;
   }
 
@@ -536,7 +538,7 @@ IN_PROC_BROWSER_TEST_F(KioskTest, KioskEnableCancel) {
   CHECK(wizard_controller);
 
   // Check Kiosk mode status.
-  EXPECT_EQ(KioskAppManager::CONSUMER_KIOSK_MODE_CONFIGURABLE,
+  EXPECT_EQ(KioskAppManager::CONSUMER_KIOSK_AUTO_LAUNCH_CONFIGURABLE,
             GetConsumerKioskModeStatus());
 
   // Wait for the login UI to come up and switch to the kiosk_enable screen.
@@ -561,7 +563,7 @@ IN_PROC_BROWSER_TEST_F(KioskTest, KioskEnableCancel) {
       content::NotificationService::AllSources()).Wait();
 
   // Check that the status still says configurable.
-  EXPECT_EQ(KioskAppManager::CONSUMER_KIOSK_MODE_CONFIGURABLE,
+  EXPECT_EQ(KioskAppManager::CONSUMER_KIOSK_AUTO_LAUNCH_CONFIGURABLE,
             GetConsumerKioskModeStatus());
 }
 
@@ -573,7 +575,7 @@ IN_PROC_BROWSER_TEST_F(KioskTest, KioskEnableConfirmed) {
   CHECK(wizard_controller);
 
   // Check Kiosk mode status.
-  EXPECT_EQ(KioskAppManager::CONSUMER_KIOSK_MODE_CONFIGURABLE,
+  EXPECT_EQ(KioskAppManager::CONSUMER_KIOSK_AUTO_LAUNCH_CONFIGURABLE,
             GetConsumerKioskModeStatus());
   wizard_controller->SkipToLoginForTesting(LoginScreenContext());
 
@@ -597,7 +599,7 @@ IN_PROC_BROWSER_TEST_F(KioskTest, KioskEnableConfirmed) {
   content::WindowedNotificationObserver(
       chrome::NOTIFICATION_KIOSK_ENABLED,
       content::NotificationService::AllSources()).Wait();
-  EXPECT_EQ(KioskAppManager::CONSUMER_KIOSK_MODE_ENABLED,
+  EXPECT_EQ(KioskAppManager::CONSUMER_KIOSK_AUTO_LAUNCH_ENABLED,
             GetConsumerKioskModeStatus());
 }
 
@@ -618,7 +620,7 @@ IN_PROC_BROWSER_TEST_F(KioskTest, KioskEnableAbortedWithAutoEnrollment) {
   CHECK(wizard_controller);
 
   // Check Kiosk mode status.
-  EXPECT_EQ(KioskAppManager::CONSUMER_KIOSK_MODE_CONFIGURABLE,
+  EXPECT_EQ(KioskAppManager::CONSUMER_KIOSK_AUTO_LAUNCH_CONFIGURABLE,
             GetConsumerKioskModeStatus());
   wizard_controller->SkipToLoginForTesting(LoginScreenContext());
 
@@ -654,7 +656,7 @@ IN_PROC_BROWSER_TEST_F(KioskTest, KioskEnableAfter2ndSigninScreen) {
   CHECK(wizard_controller);
 
   // Check Kiosk mode status.
-  EXPECT_EQ(KioskAppManager::CONSUMER_KIOSK_MODE_CONFIGURABLE,
+  EXPECT_EQ(KioskAppManager::CONSUMER_KIOSK_AUTO_LAUNCH_CONFIGURABLE,
             GetConsumerKioskModeStatus());
 
   // Wait for the login UI to come up and switch to the kiosk_enable screen.