Use content::NavigateIframeToURL in ProcessManagerBrowserTest

chrome/browser/extensions/process_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 "extensions/browser/process_manager.h"
 
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
-#include "base/strings/stringprintf.h"
 #include "chrome/browser/extensions/browser_action_test_util.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/test_extension_dir.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/extensions/extension_process_policy.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/test_utils.h"
 #include "extensions/common/value_builder.h"
 #include "extensions/test/background_page_watcher.h"
-#include "extensions/test/extension_test_message_listener.h"
 #include "net/dns/mock_host_resolver.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 
 namespace extensions {
 
 namespace {
 
 void AddFrameToSet(std::set<content::RenderFrameHost*>* frames,
                    content::RenderFrameHost* rfh) {
   if (rfh->IsRenderFrameLive())
@@ skipping 108 matching lines @@
     NavigationCompletedObserver observer(
         browser()->tab_strip_model()->GetActiveWebContents());
 
     ui_test_utils::NavigateToURL(browser(), url);
 
     // Wait until the last RenderFrameHosts are deleted. This wait doesn't take
     // long.
     observer.Wait();
   }
 
-  void NavigateIframeToURLAndWait(content::WebContents* web_contents,
-                                  const std::string iframe_id,
-                                  const GURL& url) {
-    // This is an improved version of content::NavigateIframeToURL. Unlike the
-    // other method, this does actually wait until the load of all child frames
-    // completes.
-    std::string script = base::StringPrintf(
-        "var frame = document.getElementById('%s');"
-        "frame.onload = frame.onerror = function(event) {"
-        "  frame.onload = frame.onerror = null;"
-        "  domAutomationController.send(event.type === 'load');"
-        "};"
-        "frame.src = '%s';",
-        iframe_id.c_str(), url.spec().c_str());
-    bool is_loaded = false;
-    EXPECT_TRUE(ExecuteScriptAndExtractBool(web_contents, script, &is_loaded));
-    EXPECT_TRUE(is_loaded);
-  }
-
   size_t IfExtensionsIsolated(size_t if_enabled, size_t if_disabled) {
     return content::AreAllSitesIsolatedForTesting() ||
                    IsIsolateExtensionsEnabled()
                ? if_enabled
                : if_disabled;
   }
 
  private:
   std::vector<scoped_ptr<TestExtensionDir>> temp_dirs_;
 };
@@ skipping 193 matching lines @@
   EXPECT_EQ(0u, pm->GetAllFrames().size());
   EXPECT_EQ(0u, pm->GetRenderFrameHostsForExtension(extension2->id()).size());
 
   NavigateToURL(embedded_test_server()->GetURL("/two_iframes.html"));
   EXPECT_EQ(0u, pm->GetAllFrames().size());
 
   content::WebContents* tab =
       browser()->tab_strip_model()->GetActiveWebContents();
 
   // Tests extension frames in non-extension page.
-  NavigateIframeToURLAndWait(tab, "frame1", kExt1EmptyUrl);
+  EXPECT_TRUE(content::NavigateIframeToURL(tab, "frame1", kExt1EmptyUrl));
   EXPECT_EQ(IfExtensionsIsolated(1, 0),
             pm->GetRenderFrameHostsForExtension(extension1->id()).size());
   EXPECT_EQ(IfExtensionsIsolated(1, 0), pm->GetAllFrames().size());
 
-  NavigateIframeToURLAndWait(tab, "frame2", kExt2EmptyUrl);
+  EXPECT_TRUE(content::NavigateIframeToURL(tab, "frame2", kExt2EmptyUrl));
   EXPECT_EQ(IfExtensionsIsolated(1, 0),
             pm->GetRenderFrameHostsForExtension(extension2->id()).size());
   EXPECT_EQ(IfExtensionsIsolated(2, 0), pm->GetAllFrames().size());
 
   // Tests non-extension page in extension frame.
   NavigateToURL(kExt1TwoFramesUrl);
   // 1 top-level + 2 child frames from Extension 1.
   EXPECT_EQ(3u, pm->GetAllFrames().size());
   EXPECT_EQ(3u, pm->GetRenderFrameHostsForExtension(extension1->id()).size());
   EXPECT_EQ(0u, pm->GetRenderFrameHostsForExtension(extension2->id()).size());
 
-  NavigateIframeToURLAndWait(tab, "frame1",
-                             embedded_test_server()->GetURL("/empty.html"));
+  EXPECT_TRUE(content::NavigateIframeToURL(tab, "frame1",
+                                           embedded_test_server()
+                                           ->GetURL("/empty.html")));
   // 1 top-level + 1 child frame from Extension 1.
   EXPECT_EQ(2u, pm->GetRenderFrameHostsForExtension(extension1->id()).size());
   EXPECT_EQ(2u, pm->GetAllFrames().size());
 
-  NavigateIframeToURLAndWait(tab, "frame1", kExt1EmptyUrl);
+  EXPECT_TRUE(content::NavigateIframeToURL(tab, "frame1", kExt1EmptyUrl));
   // 1 top-level + 2 child frames from Extension 1.
   EXPECT_EQ(3u, pm->GetAllFrames().size());
   EXPECT_EQ(3u, pm->GetRenderFrameHostsForExtension(extension1->id()).size());
 
   // Load a frame from another extension.
-  NavigateIframeToURLAndWait(tab, "frame1", kExt2EmptyUrl);
+  EXPECT_TRUE(content::NavigateIframeToURL(tab, "frame1", kExt2EmptyUrl));
   // 1 top-level + 1 child frame from Extension 1,
   // 1 child frame from Extension 2.
   EXPECT_EQ(IfExtensionsIsolated(3, 2), pm->GetAllFrames().size());
   EXPECT_EQ(2u, pm->GetRenderFrameHostsForExtension(extension1->id()).size());
   EXPECT_EQ(IfExtensionsIsolated(1, 0),
             pm->GetRenderFrameHostsForExtension(extension2->id()).size());
 
   // Destroy all existing frames by navigating to another extension.
   NavigateToURL(extension2->url().Resolve("empty.html"));
   EXPECT_EQ(1u, pm->GetAllFrames().size());
   EXPECT_EQ(0u, pm->GetRenderFrameHostsForExtension(extension1->id()).size());
   EXPECT_EQ(1u, pm->GetRenderFrameHostsForExtension(extension2->id()).size());
 
   // Test about:blank and about:srcdoc child frames.
   NavigateToURL(extension2->url().Resolve("srcdoc_iframe.html"));
   // 1 top-level frame + 1 child frame from Extension 2.
   EXPECT_EQ(2u, pm->GetAllFrames().size());
   EXPECT_EQ(2u, pm->GetRenderFrameHostsForExtension(extension2->id()).size());
 
   NavigateToURL(extension2->url().Resolve("blank_iframe.html"));
   // 1 top-level frame + 1 child frame from Extension 2.
   EXPECT_EQ(2u, pm->GetAllFrames().size());
   EXPECT_EQ(2u, pm->GetRenderFrameHostsForExtension(extension2->id()).size());
 
   // Sandboxed frames are not viewed as extension frames.
-  NavigateIframeToURLAndWait(tab, "frame0",
-                             extension2->url().Resolve("sandboxed.html"));
+  EXPECT_TRUE(content::NavigateIframeToURL(tab, "frame0",
+                                           extension2->url()
+                                           .Resolve("sandboxed.html")));
   // 1 top-level frame from Extension 2.
   EXPECT_EQ(1u, pm->GetAllFrames().size());
   EXPECT_EQ(1u, pm->GetRenderFrameHostsForExtension(extension2->id()).size());
 
   NavigateToURL(extension2->url().Resolve("sandboxed.html"));
   EXPECT_EQ(0u, pm->GetAllFrames().size());
   EXPECT_EQ(0u, pm->GetRenderFrameHostsForExtension(extension2->id()).size());
 
   // Test nested frames (same extension).
   NavigateToURL(kExt2TwoFramesUrl);
   // 1 top-level + 2 child frames from Extension 2.
   EXPECT_EQ(3u, pm->GetAllFrames().size());
   EXPECT_EQ(3u, pm->GetRenderFrameHostsForExtension(extension2->id()).size());
 
-  NavigateIframeToURLAndWait(tab, "frame1", kExt2TwoFramesUrl);
+  EXPECT_TRUE(content::NavigateIframeToURL(tab, "frame1", kExt2TwoFramesUrl));
   // 1 top-level + 2 child frames from Extension 1,
   // 2 child frames in frame1 from Extension 2.
   EXPECT_EQ(5u, pm->GetAllFrames().size());
   EXPECT_EQ(5u, pm->GetRenderFrameHostsForExtension(extension2->id()).size());
 
   // The extension frame from the other extension should not be classified as an
   // extension (unless out-of-process frames are enabled).
-  NavigateIframeToURLAndWait(tab, "frame1", kExt1EmptyUrl);
+  EXPECT_TRUE(content::NavigateIframeToURL(tab, "frame1", kExt1EmptyUrl));
   // 1 top-level + 1 child frames from Extension 2,
   // 1 child frame from Extension 1.
   EXPECT_EQ(IfExtensionsIsolated(3, 2), pm->GetAllFrames().size());
   EXPECT_EQ(IfExtensionsIsolated(1, 0),
             pm->GetRenderFrameHostsForExtension(extension1->id()).size());
   EXPECT_EQ(2u, pm->GetRenderFrameHostsForExtension(extension2->id()).size());
 
-  NavigateIframeToURLAndWait(tab, "frame2", kExt1TwoFramesUrl);
+  EXPECT_TRUE(content::NavigateIframeToURL(tab, "frame2", kExt1TwoFramesUrl));
   // 1 top-level + 1 child frames from Extension 2,
   // 1 child frame + 2 child frames in frame2 from Extension 1.
   EXPECT_EQ(IfExtensionsIsolated(5, 1), pm->GetAllFrames().size());
   EXPECT_EQ(IfExtensionsIsolated(4, 0),
             pm->GetRenderFrameHostsForExtension(extension1->id()).size());
   EXPECT_EQ(1u, pm->GetRenderFrameHostsForExtension(extension2->id()).size());
 
   // Crash tab where the top-level frame is an extension frame.
   content::CrashTab(tab);
   EXPECT_EQ(0u, pm->GetAllFrames().size());
   EXPECT_EQ(0u, pm->GetRenderFrameHostsForExtension(extension1->id()).size());
   EXPECT_EQ(0u, pm->GetRenderFrameHostsForExtension(extension2->id()).size());
 
   // Now load an extension page and a non-extension page...
   ui_test_utils::NavigateToURLWithDisposition(
       browser(), kExt1EmptyUrl, NEW_BACKGROUND_TAB,
       ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
   NavigateToURL(embedded_test_server()->GetURL("/two_iframes.html"));
   EXPECT_EQ(1u, pm->GetAllFrames().size());
 
   // ... load an extension frame in the non-extension process
-  NavigateIframeToURLAndWait(tab, "frame1", kExt1EmptyUrl);
+  EXPECT_TRUE(content::NavigateIframeToURL(tab, "frame1", kExt1EmptyUrl));
   EXPECT_EQ(IfExtensionsIsolated(2, 1),
             pm->GetRenderFrameHostsForExtension(extension1->id()).size());
 
   // ... and take down the tab. The extension process is not part of the tab,
   // so it should be kept alive (minus the frames that died).
   content::CrashTab(tab);
   EXPECT_EQ(1u, pm->GetAllFrames().size());
   EXPECT_EQ(1u, pm->GetRenderFrameHostsForExtension(extension1->id()).size());
 }
 
@@ skipping 27 matching lines @@
   pm->OnNetworkRequestDone(frame_host, 1);
   EXPECT_EQ(baseline_keepalive, pm->GetLazyKeepaliveCount(extension.get()));
 
   // Simulate only a request completion for this ID and ensure it doesn't result
   // in keepalive decrement.
   pm->OnNetworkRequestDone(frame_host, 2);
   EXPECT_EQ(baseline_keepalive, pm->GetLazyKeepaliveCount(extension.get()));
 }
 
 }  // namespace extensions