Convert tests to use GetURL(host, path) instead of redirector.

content/browser/site_per_process_browsertest.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 "content/browser/site_per_process_browsertest.h"
 
 #include "base/command_line.h"
 #include "base/strings/stringprintf.h"
 #include "content/browser/frame_host/cross_process_frame_connector.h"
 #include "content/browser/frame_host/frame_tree.h"
@@ skipping 212 matching lines @@
         static_cast<WebContentsImpl*>(shell()->web_contents())
             ->GetRenderWidgetHostViewsInTree();
     EXPECT_EQ(1U, views_set.size());
   }
   RenderFrameProxyHost* proxy_to_parent =
       child->render_manager()->GetRenderFrameProxyHost(
           shell()->web_contents()->GetSiteInstance());
   EXPECT_FALSE(proxy_to_parent);
 
   // Load cross-site page into iframe.
-  NavigateFrameToURL(
-      root->child_at(0),
-      embedded_test_server()->GetURL("/cross-site/foo.com/title2.html"));
+  GURL url = embedded_test_server()->GetURL("foo.com", "/title2.html");
+  NavigateFrameToURL(root->child_at(0), url);
   // Verify that the navigation succeeded and the expected URL was loaded.
   EXPECT_TRUE(observer.navigation_succeeded());
-  EXPECT_EQ(embedded_test_server()->base_url().scheme(),
-            observer.navigation_url().scheme());
-  EXPECT_EQ("foo.com", observer.navigation_url().host());
-  EXPECT_EQ("/title2.html", observer.navigation_url().path());
+  EXPECT_EQ(url, observer.navigation_url());
 
   // Ensure that we have created a new process for the subframe.
   ASSERT_EQ(2U, root->child_count());
   SiteInstance* site_instance = child->current_frame_host()->GetSiteInstance();
   RenderViewHost* rvh = child->current_frame_host()->render_view_host();
   RenderProcessHost* rph = child->current_frame_host()->GetProcess();
   EXPECT_NE(shell()->web_contents()->GetRenderViewHost(), rvh);
   EXPECT_NE(shell()->web_contents()->GetSiteInstance(), site_instance);
   EXPECT_NE(shell()->web_contents()->GetRenderProcessHost(), rph);
   {
     // There should be now two RenderWidgetHosts, one for each process
     // rendering a frame.
     std::set<RenderWidgetHostView*> views_set =
         static_cast<WebContentsImpl*>(shell()->web_contents())
             ->GetRenderWidgetHostViewsInTree();
     EXPECT_EQ(2U, views_set.size());
   }
   proxy_to_parent = child->render_manager()->GetProxyToParent();
   EXPECT_TRUE(proxy_to_parent);
   EXPECT_TRUE(proxy_to_parent->cross_process_frame_connector());
   EXPECT_EQ(
       rvh->GetView(),
       proxy_to_parent->cross_process_frame_connector()->get_view_for_testing());
 
   // Load another cross-site page into the same iframe.
-  NavigateFrameToURL(
-      root->child_at(0),
-      embedded_test_server()->GetURL("/cross-site/bar.com/title3.html"));
+  url = embedded_test_server()->GetURL("bar.com", "/title3.html");
+  NavigateFrameToURL(root->child_at(0), url);
   EXPECT_TRUE(observer.navigation_succeeded());
-  EXPECT_EQ(embedded_test_server()->base_url().scheme(),
-            observer.navigation_url().scheme());
-  EXPECT_EQ("bar.com", observer.navigation_url().host());
-  EXPECT_EQ("/title3.html", observer.navigation_url().path());
+  EXPECT_EQ(url, observer.navigation_url());
 
   // Check again that a new process is created and is different from the
   // top level one and the previous one.
   ASSERT_EQ(2U, root->child_count());
   child = root->child_at(0);
   EXPECT_NE(shell()->web_contents()->GetRenderViewHost(),
             child->current_frame_host()->render_view_host());
   EXPECT_NE(rvh, child->current_frame_host()->render_view_host());
   EXPECT_NE(shell()->web_contents()->GetSiteInstance(),
             child->current_frame_host()->GetSiteInstance());
@@ skipping 27 matching lines @@
   SitePerProcessWebContentsObserver observer(shell()->web_contents());
 
   // Load same-site page into iframe.
   FrameTreeNode* child = root->child_at(0);
   GURL http_url(embedded_test_server()->GetURL("/title1.html"));
   NavigateFrameToURL(child, http_url);
   EXPECT_EQ(http_url, observer.navigation_url());
   EXPECT_TRUE(observer.navigation_succeeded());
 
   // Load cross-site page into iframe.
-  NavigateFrameToURL(
-      root->child_at(0),
-      embedded_test_server()->GetURL("/cross-site/foo.com/title2.html"));
+  GURL url = embedded_test_server()->GetURL("foo.com", "/title2.html");
+  NavigateFrameToURL(root->child_at(0), url);
   EXPECT_TRUE(observer.navigation_succeeded());
-  EXPECT_EQ("foo.com", observer.navigation_url().host());
-  EXPECT_EQ("/title2.html", observer.navigation_url().path());
+  EXPECT_EQ(url, observer.navigation_url());
 
   // Ensure that we have created a new process for the subframe.
   ASSERT_EQ(2U, root->child_count());
   SiteInstance* site_instance = child->current_frame_host()->GetSiteInstance();
   EXPECT_NE(shell()->web_contents()->GetSiteInstance(), site_instance);
 
   // Emulate the main frame changing the src of the iframe such that it
   // navigates cross-site.
-  NavigateIframeToURL(
-      shell(),
-      embedded_test_server()->GetURL("/cross-site/bar.com/title3.html"),
-      "test");
+  url = embedded_test_server()->GetURL("bar.com", "/title3.html");
+  NavigateIframeToURL(shell(), url, "test");
   EXPECT_TRUE(observer.navigation_succeeded());
-  EXPECT_EQ("bar.com", observer.navigation_url().host());
-  EXPECT_EQ("/title3.html", observer.navigation_url().path());
+  EXPECT_EQ(url, observer.navigation_url());
 
   // Check again that a new process is created and is different from the
   // top level one and the previous one.
   ASSERT_EQ(2U, root->child_count());
   child = root->child_at(0);
   EXPECT_NE(shell()->web_contents()->GetSiteInstance(),
             child->current_frame_host()->GetSiteInstance());
   EXPECT_NE(site_instance,
             child->current_frame_host()->GetSiteInstance());
 
@@ skipping 312 matching lines @@
     NavigateFrameToURL(root->child_at(0), http_url);
     EXPECT_EQ(http_url, observer.navigation_url());
     EXPECT_TRUE(observer.navigation_succeeded());
     RenderFrameProxyHost* proxy_to_parent =
         root->child_at(0)->render_manager()->GetRenderFrameProxyHost(
             shell()->web_contents()->GetSiteInstance());
     EXPECT_FALSE(proxy_to_parent);
   }
 
   // Create the cross-site URL to navigate to.
-  GURL::Replacements replace_host;
-  std::string foo_com("foo.com");
-  GURL cross_site_url(embedded_test_server()->GetURL("/frame_tree/1-1.html"));
-  replace_host.SetHostStr(foo_com);
-  cross_site_url = cross_site_url.ReplaceComponents(replace_host);
+  GURL cross_site_url =
+      embedded_test_server()->GetURL("foo.com", "/frame_tree/1-1.html");
 
   // Load cross-site page into the second iframe without waiting for the
   // navigation to complete. Once LoadURLWithParams returns, we would expect
   // proxies to have been created in the frame tree, but children of the
   // navigating frame to still be present. The reason is that we don't run the
   // message loop, so no IPCs that alter the frame tree can be processed.
   FrameTreeNode* child = root->child_at(1);
   SiteInstance* site = NULL;
   {
     SitePerProcessWebContentsObserver observer(shell()->web_contents());
@@ skipping 12 matching lines @@
         root->child_at(0)->render_manager()->GetRenderFrameProxyHost(site));
     EXPECT_FALSE(child->render_manager()->GetRenderFrameProxyHost(site));
     for (size_t i = 0; i < child->child_count(); ++i) {
       EXPECT_FALSE(
           child->child_at(i)->render_manager()->GetRenderFrameProxyHost(site));
     }
     // Now that the verification is done, run the message loop and wait for the
     // navigation to complete.
     navigation_observer.Wait();
     EXPECT_FALSE(child->render_manager()->pending_frame_host());
+    EXPECT_TRUE(observer.navigation_succeeded());
     EXPECT_EQ(cross_site_url, observer.navigation_url());
-    EXPECT_TRUE(observer.navigation_succeeded());
   }
 
   // Load another cross-site page into the same iframe.
-  cross_site_url = embedded_test_server()->GetURL("/title2.html");
-  std::string bar_com("bar.com");
-  replace_host.SetHostStr(bar_com);
-  cross_site_url = cross_site_url.ReplaceComponents(replace_host);
-
+  cross_site_url = embedded_test_server()->GetURL("bar.com", "/title2.html");
   {
     // Perform the same checks as the first cross-site navigation, since
     // there have been issues in subsequent cross-site navigations. Also ensure
     // that the SiteInstance has properly changed.
     // TODO(nasko): Once we have proper cleanup of resources, add code to
     // verify that the intermediate SiteInstance/RenderFrameHost have been
     // properly cleaned up.
     SitePerProcessWebContentsObserver observer(shell()->web_contents());
     TestFrameNavigationObserver navigation_observer(child);
     NavigationController::LoadURLParams params(cross_site_url);
@@ skipping 10 matching lines @@
     EXPECT_TRUE(root->render_manager()->GetRenderFrameProxyHost(site2));
     EXPECT_TRUE(
         root->child_at(0)->render_manager()->GetRenderFrameProxyHost(site2));
     EXPECT_FALSE(child->render_manager()->GetRenderFrameProxyHost(site2));
     for (size_t i = 0; i < child->child_count(); ++i) {
       EXPECT_FALSE(
           child->child_at(i)->render_manager()->GetRenderFrameProxyHost(site2));
     }
 
     navigation_observer.Wait();
+    EXPECT_TRUE(observer.navigation_succeeded());
     EXPECT_EQ(cross_site_url, observer.navigation_url());
-    EXPECT_TRUE(observer.navigation_succeeded());
     EXPECT_EQ(0U, child->child_count());
   }
 }
 
 }  // namespace content