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

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/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 343 matching lines @@
   // server to avoid pending data loads that could be lingering on tear down and
   // cause DCHECK failure in utility_process_host_impl.cc.
   manager()->AddApp("fake_app_1");
   manager()->AddApp("fake_app_2");
   EXPECT_EQ("fake_app_1,fake_app_2", GetAppIds());
 
   // Set an auto launch app.
   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());
 
   // Check auto launch permissions.
   EXPECT_FALSE(manager()->IsAutoLaunchEnabled());
   manager()->SetEnableAutoLaunch(true);
   EXPECT_TRUE(manager()->IsAutoLaunchEnabled());
 
   // Remove the auto launch app.
@@ skipping 302 matching lines @@
   manager()->GetConsumerKioskAutoLaunchStatus(
       base::Bind(&ConsumerKioskAutoLaunchStatusCheck,
                  status.get(),
                  runner3->QuitClosure()));
   runner3->Run();
   EXPECT_EQ(*status.get(),
             KioskAppManager::CONSUMER_KIOSK_AUTO_LAUNCH_DISABLED);
 }
 
 }  // namespace chromeos