Fix and re-enable KioskTest.LaunchAppWithNetworkConfigAccelerator.

chrome/browser/chromeos/login/kiosk_browsertest.cc

 // Copyright (c) 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 "apps/app_window.h"
 #include "apps/app_window_registry.h"
 #include "apps/ui/native_app_window.h"
 #include "ash/desktop_background/desktop_background_controller.h"
 #include "ash/desktop_background/desktop_background_controller_observer.h"
 #include "ash/shell.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
+#include "base/synchronization/lock.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/app_mode/fake_cws.h"
 #include "chrome/browser/chromeos/app_mode/kiosk_app_launch_error.h"
 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
 #include "chrome/browser/chromeos/login/app_launch_controller.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
 #include "chrome/browser/chromeos/login/test/app_window_waiter.h"
 #include "chrome/browser/chromeos/login/test/oobe_base_test.h"
 #include "chrome/browser/chromeos/login/test/oobe_screen_waiter.h"
@@ skipping 106 matching lines @@
   LOG(INFO) << "kiosk locked  = " << in_locked;
   *out_locked = in_locked;
   runner_quit_task.Run();
 }
 
 // Helper function for WaitForNetworkTimeOut.
 void OnNetworkWaitTimedOut(const base::Closure& runner_quit_task) {
   runner_quit_task.Run();
 }
 
+// Helper function for LockFileThread.
+void LockAndUnlock(scoped_ptr<base::Lock> lock) {

[bartfab (slow), 2014/08/20 14:45:29]

Nit: #include "base/memory/scoped_ptr.h"

[Joao da Silva, 2014/08/21 08:00:00]

Done.

+  lock->Acquire();
+  lock->Release();
+}
+
 // Helper functions for CanConfigureNetwork mock.
 class ScopedCanConfigureNetwork {
  public:
   ScopedCanConfigureNetwork(bool can_configure, bool needs_owner_auth)
       : can_configure_(can_configure),
         needs_owner_auth_(needs_owner_auth),
         can_configure_network_callback_(
             base::Bind(&ScopedCanConfigureNetwork::CanConfigureNetwork,
                        base::Unretained(this))),
         needs_owner_auth_callback_(base::Bind(
@@ skipping 346 matching lines @@
 
     SimulateNetworkOnline();
     WaitForAppLaunchSuccess();
   }
 
   AppLaunchController* GetAppLaunchController() {
     return chromeos::LoginDisplayHostImpl::default_host()
         ->GetAppLaunchController();
   }
 
+  // Returns a lock that is holding a task in the FILE thread. Any tasks posted

[bartfab (slow), 2014/08/20 14:45:29]

Nit: s/ in / on /

[Joao da Silva, 2014/08/21 08:00:00]

Done.

+  // to the FILE thread after this call will be blocked until the returned
+  // lock is released.
+  // This can be used to prevent app installation from completing until some
+  // other conditions are checked and triggered. For example, this can be used
+  // to trigger the network screen during app launch without racing with the
+  // app launching process itself.
+  scoped_ptr<base::AutoLock> LockFileThread() {
+    scoped_ptr<base::Lock> lock(new base::Lock);
+    scoped_ptr<base::AutoLock> auto_lock(new base::AutoLock(*lock));
+    content::BrowserThread::PostTask(

[bartfab (slow), 2014/08/20 14:45:29]

Nit: #include "content/public/browser/browser_thread.h"

[Joao da Silva, 2014/08/21 08:00:00]

Done.

+        content::BrowserThread::FILE, FROM_HERE,

[bartfab (slow), 2014/08/20 14:45:29]

Nit: #include "base/location.h"

[Joao da Silva, 2014/08/21 08:00:00]

Done.

+        base::Bind(&LockAndUnlock, base::Passed(&lock)));

[bartfab (slow), 2014/08/20 14:45:29]

Nit 1: #include "base/bind.h"
Nit 1: #include "base/bind_helpers.h"

[Joao da Silva, 2014/08/21 08:00:00]

Done.

+    return auto_lock.Pass();
+  }
+
   MockUserManager* mock_user_manager() { return mock_user_manager_.get(); }
 
   void set_test_app_id(const std::string& test_app_id) {
     test_app_id_ = test_app_id;
   }
   const std::string& test_app_id() const { return test_app_id_; }
   void set_test_app_version(const std::string& version) {
     test_app_version_ = version;
   }
   const std::string& test_app_version() const { return test_app_version_; }
@@ skipping 34 matching lines @@
   // Tests the network down case for the initial app download and launch.
   RunAppLaunchNetworkDownTest();
 }
 
 IN_PROC_BROWSER_TEST_F(KioskTest, LaunchAppNetworkDown) {
   // Tests the network down case for launching an existing app that is
   // installed in PRE_LaunchAppNetworkDown.
   RunAppLaunchNetworkDownTest();
 }
 
-// TODO(zelidrag): Figure out why this test is flaky on bbots.
-IN_PROC_BROWSER_TEST_F(KioskTest,
-                       DISABLED_LaunchAppWithNetworkConfigAccelerator) {
+IN_PROC_BROWSER_TEST_F(KioskTest, LaunchAppWithNetworkConfigAccelerator) {
   ScopedCanConfigureNetwork can_configure_network(true, false);
 
+  // Block app loading until the network screen is shown.
+  scoped_ptr<base::AutoLock> lock = LockFileThread();
+
   // Start app launch and wait for network connectivity timeout.
   StartAppLaunchFromLoginScreen(SimulateNetworkOnlineClosure());
   OobeScreenWaiter splash_waiter(OobeDisplay::SCREEN_APP_LAUNCH_SPLASH);
   splash_waiter.Wait();
 
   // A network error screen should be shown after authenticating.
   OobeScreenWaiter error_screen_waiter(OobeDisplay::SCREEN_ERROR_MESSAGE);
   // Simulate Ctrl+Alt+N accelerator.
   GetLoginUI()->CallJavascriptFunction(
       "cr.ui.Oobe.handleAccelerator",
       base::StringValue("app_launch_network_config"));
   error_screen_waiter.Wait();
   ASSERT_TRUE(GetAppLaunchController()->showing_network_dialog());
 
   // Continue button should be visible since we are online.
   JsExpect("$('continue-network-config-btn').hidden == false");
 
   // Click on [Continue] button.
   ASSERT_TRUE(content::ExecuteScript(
       GetLoginUI()->GetWebContents(),
       "(function() {"
       "var e = new Event('click');"
       "$('continue-network-config-btn').dispatchEvent(e);"
       "})();"));
 
+  // Let app launching resume.
+  lock.reset();
+
   WaitForAppLaunchSuccess();
 }
 
 IN_PROC_BROWSER_TEST_F(KioskTest, LaunchAppNetworkDownConfigureNotAllowed) {
   // Mock network could not be configured.
   ScopedCanConfigureNetwork can_configure_network(false, true);
 
   // Start app launch and wait for network connectivity timeout.
   StartAppLaunchFromLoginScreen(SimulateNetworkOfflineClosure());
   OobeScreenWaiter splash_waiter(OobeDisplay::SCREEN_APP_LAUNCH_SPLASH);
@@ skipping 770 matching lines @@
   content::WindowedNotificationObserver(
       chrome::NOTIFICATION_KIOSK_AUTOLAUNCH_WARNING_VISIBLE,
       content::NotificationService::AllSources()).Wait();
 
   // Wait for the wallpaper to load.
   WaitForWallpaper();
   EXPECT_TRUE(wallpaper_loaded());
 }
 
 }  // namespace chromeos