Deflake ComponentExtensionRuntimeReload test and re-enable.

chrome/browser/apps/app_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 "apps/launcher.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/prefs/pref_service.h"
@@ skipping 1034 matching lines @@
   app_loaded_observer.Wait();
   ASSERT_TRUE(should_install.seen());
 
   ExtensionTestMessageListener launched_listener("Launched", false);
   OpenApplication(AppLaunchParams(
       browser()->profile(), extension, LAUNCH_CONTAINER_NONE, NEW_WINDOW));
 
   ASSERT_TRUE(launched_listener.WaitUntilSatisfied());
 }
 
 // Flaky: http://crbug.com/407409

[tapted, 2014/09/23 00:16:33]

This can be removed, or replaced with a brief description of the test.

[Anand Mistry (off Chromium), 2014/09/23 00:25:43]

Removed. No longer relevant.

 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest,
-                       DISABLED_ComponentExtensionRuntimeReload) {
+                       ComponentExtensionRuntimeReload) {
   // Ensure that we wait until the background page is run (to register the
   // OnLaunched listener) before trying to open the application. This is similar
   // to LoadAndLaunchPlatformApp, but we want to load as a component extension.
   content::WindowedNotificationObserver app_loaded_observer(
       content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME,
       content::NotificationService::AllSources());
 
   const Extension* extension = LoadExtensionAsComponent(
       test_data_dir_.AppendASCII("platform_apps").AppendASCII("component"));
   ASSERT_TRUE(extension);
 
   app_loaded_observer.Wait();
 
   {
     ExtensionTestMessageListener launched_listener("Launched", false);
     OpenApplication(AppLaunchParams(
         browser()->profile(), extension, LAUNCH_CONTAINER_NONE, NEW_WINDOW));
     ASSERT_TRUE(launched_listener.WaitUntilSatisfied());
   }
 
   {
     ASSERT_TRUE(ExecuteScriptInBackgroundPageNoWait(
-        extension->id(), "chrome.runtime.reload();"));
+        extension->id(),
+        // NoWait actually waits for a domAutomationController.send() which is
+        // implicitly append to the script. Since reload() restarts the
+        // extension, the send after reload may not get executed. To get around
+        // this, send first, then execute the reload().
+        "window.domAutomationController.send(0);"
+        "chrome.runtime.reload();"));
     ExtensionTestMessageListener launched_listener("Launched", false);

[tapted, 2014/09/23 00:16:33]

should this come before the ExecuteScript? Otherwise I think it can miss seeing
the message. (e.g. what happens if you put a sleep(10) before this line?)

[Anand Mistry (off Chromium), 2014/09/23 00:25:43]

Done.

[tapted, 2014/09/23 00:48:00]

(actually I realised after I sent this that a sleep(..) here probably won't make
a flake - the message will still be queued - but since
ExecuteScriptInBackgroundPageNoWait(.) is spinning its own runloops, it's better
to have the listener listening throughout.) /allgood

     ASSERT_TRUE(launched_listener.WaitUntilSatisfied());
   }
 }
 
 // Fails on Win7. http://crbug.com/171450
 #if defined(OS_WIN)
 #define MAYBE_Messaging DISABLED_Messaging
 #else
 #define MAYBE_Messaging Messaging
 #endif
@@ skipping 230 matching lines @@
         LoadAndLaunchPlatformApp("reinstall_data_cleanup", "Launched");
     ASSERT_TRUE(extension);
     ASSERT_EQ(extension_id, extension->id());
 
     ResultCatcher result_catcher;
     EXPECT_TRUE(result_catcher.GetNextResult());
   }
 }
 
 }  // namespace extensions