Add testing configs for ParseHTMLOnMainThread experiment

chrome/browser/extensions/extension_resource_request_policy_apitest.cc

 // Copyright (c) 2012 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 "base/command_line.h"
 #include "base/logging.h"
 #include "build/build_config.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/test_switches.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/navigation_handle.h"
+#include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/test/browser_test_utils.h"
 #include "extensions/common/switches.h"
 #include "net/dns/mock_host_resolver.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "url/gurl.h"
 
 class ExtensionResourceRequestPolicyTest : public ExtensionApiTest {
  protected:
@@ skipping 203 matching lines @@
       browser()->tab_strip_model()->GetActiveWebContents(),
       "window.domAutomationController.send(document.title)",
       &result));
   EXPECT_EQ("New Tab Page Loaded Successfully", result);
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest,
                        LinkToWebAccessibleResources) {
   std::string result;
   ASSERT_TRUE(embedded_test_server()->Start());
-  ASSERT_TRUE(LoadExtension(test_data_dir_
-      .AppendASCII("extension_resource_request_policy")
-      .AppendASCII("web_accessible")));
+  const extensions::Extension* extension = LoadExtension(
+      test_data_dir_.AppendASCII("extension_resource_request_policy")
+          .AppendASCII("web_accessible"));

[Devlin, 2016/08/10 20:42:35]

nitty nit: leave in an ASSERT_TRUE(extension) so that this still gives us a nice
error if the extension fails to load.

[Charlie Harrison, 2016/08/10 20:45:35]

Done. Sorry about that.

 
   GURL accessible_linked_resource(embedded_test_server()->GetURL(
       "/extensions/api_test/extension_resource_request_policy/"
       "web_accessible/accessible_link_resource.html"));
   ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(
       browser(), accessible_linked_resource, 1);
   ASSERT_TRUE(content::ExecuteScriptAndExtractString(
       browser()->tab_strip_model()->GetActiveWebContents(),
       "window.domAutomationController.send(document.URL)",
       &result));
   EXPECT_NE("about:blank", result);
 
   GURL nonaccessible_linked_resource(embedded_test_server()->GetURL(
       "/extensions/api_test/extension_resource_request_policy/"
       "web_accessible/nonaccessible_link_resource.html"));
   ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(browser(),
       nonaccessible_linked_resource, 2);
   ASSERT_TRUE(content::ExecuteScriptAndExtractString(
       browser()->tab_strip_model()->GetActiveWebContents(),
       "window.domAutomationController.send(document.URL)",
       &result));
   EXPECT_EQ("about:blank", result);
 
+
+  // Redirects can sometimes occur before the load event, so use a
+  // UrlLoadObserver instead of blocking waiting for two load events.
+  GURL accessible_url = extension->GetResourceURL("/test.png");
+  ui_test_utils::UrlLoadObserver accessible_observer(
+      accessible_url, content::NotificationService::AllSources());
   GURL accessible_client_redirect_resource(embedded_test_server()->GetURL(
       "/extensions/api_test/extension_resource_request_policy/"
       "web_accessible/accessible_redirect_resource.html"));
-  ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(browser(),
-      accessible_client_redirect_resource, 2);
-  ASSERT_TRUE(content::ExecuteScriptAndExtractString(
-      browser()->tab_strip_model()->GetActiveWebContents(),
-      "window.domAutomationController.send(document.URL)",
-      &result));
-  EXPECT_NE("about:blank", result);
+  ui_test_utils::NavigateToURL(browser(), accessible_client_redirect_resource);
+  accessible_observer.Wait();
+  EXPECT_EQ(browser()

[Devlin, 2016/08/10 20:42:35]

nitty nit: expected, actual
so
EXPECT_EQ(accessible_url,
          <web_contents_url>)

[Charlie Harrison, 2016/08/10 20:45:35]

Done.

+                ->tab_strip_model()
+                ->GetActiveWebContents()
+                ->GetLastCommittedURL(),
+            accessible_url);
 
+  ui_test_utils::UrlLoadObserver nonaccessible_observer(
+      GURL("about:blank"), content::NotificationService::AllSources());
   GURL nonaccessible_client_redirect_resource(embedded_test_server()->GetURL(
       "/extensions/api_test/extension_resource_request_policy/"
       "web_accessible/nonaccessible_redirect_resource.html"));
-  ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(browser(),
-      nonaccessible_client_redirect_resource, 2);
-  ASSERT_TRUE(content::ExecuteScriptAndExtractString(
-      browser()->tab_strip_model()->GetActiveWebContents(),
-      "window.domAutomationController.send(document.URL)",
-      &result));
-  EXPECT_EQ("about:blank", result);
+  ui_test_utils::NavigateToURL(browser(),
+                               nonaccessible_client_redirect_resource);
+  nonaccessible_observer.Wait();
+  EXPECT_EQ(browser()
+                ->tab_strip_model()
+                ->GetActiveWebContents()
+                ->GetLastCommittedURL(),
+            GURL("about:blank"));
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest,
                        WebAccessibleResourcesWithCSP) {
   std::string result;
   ASSERT_TRUE(embedded_test_server()->Start());
   ASSERT_TRUE(LoadExtension(test_data_dir_
       .AppendASCII("extension_resource_request_policy")
       .AppendASCII("web_accessible")));
 
@@ skipping 77 matching lines @@
 
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
 
   GURL private_page(
       "chrome-extension://kegmjfcnjamahdnldjmlpachmpielcdk/private.html");
   NavigationErrorObserver observer(web_contents, private_page);
   ASSERT_TRUE(content::ExecuteScript(web_contents, "navigateFrameNow()"));
   observer.Wait();
 }