Updated KioskAppManager to track whether an app was auto-launched.

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 b90f73b5afa41eae57e3c3f9616533faf09b9c77..5a2cd61534fd82fdac0964e83dedf3beb35f233f 100644
--- a/chrome/browser/chromeos/app_mode/kiosk_app_manager_browsertest.cc
+++ b/chrome/browser/chromeos/app_mode/kiosk_app_manager_browsertest.cc
@@ -361,11 +361,26 @@ IN_PROC_BROWSER_TEST_F(KioskAppManagerTest, Basic) {
   manager()->SetAutoLaunchApp("fake_app_1");
   EXPECT_EQ("fake_app_1", manager()->GetAutoLaunchApp());
 
+  // Make sure that if an app was auto launched, it is reflected in the

[bartfab (slow), 2015/02/06 14:14:08]

Nit: "with zero delay"

[Andrew T Wilson (Slow), 2015/02/06 20:43:50]

Done.

+  // app data.
+  KioskAppManager::App app;
+  manager()->GetApp("fake_app_1", &app);
+  EXPECT_FALSE(app.was_auto_launched_with_zero_delay);
+
+  manager()->SetAppWasAutoLaunchedWithZeroDelay("fake_app_1");
+  manager()->GetApp("fake_app_1", &app);
+  EXPECT_TRUE(app.was_auto_launched_with_zero_delay);
+
   // Clear the auto launch app.
   manager()->SetAutoLaunchApp("");
   EXPECT_EQ("", manager()->GetAutoLaunchApp());
   EXPECT_FALSE(manager()->IsAutoLaunchEnabled());
 
+  // App should still report it was auto launched even though it is no longer

[bartfab (slow), 2015/02/06 14:14:07]

Nit: "with zero delay"

[Andrew T Wilson (Slow), 2015/02/06 20:43:50]

Done.

+  // set to auto launch in the future.
+  manager()->GetApp("fake_app_1", &app);
+  EXPECT_TRUE(app.was_auto_launched_with_zero_delay);
+
   // Set another auto launch app.
   manager()->SetAutoLaunchApp("fake_app_2");
   EXPECT_EQ("fake_app_2", manager()->GetAutoLaunchApp());