Migrating tests to use EmbeddedTestServer (/content)

content/browser/web_contents/web_contents_impl_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 "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "content/browser/frame_host/navigation_entry_impl.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/browser/web_contents/web_contents_view.h"
@@ skipping 178 matching lines @@
 // See: http://crbug.com/298193
 #if defined(OS_WIN) || defined(OS_LINUX)
 #define MAYBE_DidStopLoadingDetails DISABLED_DidStopLoadingDetails
 #else
 #define MAYBE_DidStopLoadingDetails DidStopLoadingDetails
 #endif
 
 // Test that DidStopLoading includes the correct URL in the details.
 IN_PROC_BROWSER_TEST_F(WebContentsImplBrowserTest,
                        MAYBE_DidStopLoadingDetails) {
-  ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
+  ASSERT_TRUE(embedded_test_server()->Start());
 
   LoadStopNotificationObserver load_observer(
       &shell()->web_contents()->GetController());
   NavigateToURL(shell(), embedded_test_server()->GetURL("/title1.html"));
   load_observer.Wait();
 
   EXPECT_EQ("/title1.html", load_observer.url_.path());
   EXPECT_EQ(0, load_observer.session_index_);
   EXPECT_EQ(&shell()->web_contents()->GetController(),
             load_observer.controller_);
 }
 
 // See: http://crbug.com/298193
 #if defined(OS_WIN) || defined(OS_LINUX)
 #define MAYBE_DidStopLoadingDetailsWithPending \
   DISABLED_DidStopLoadingDetailsWithPending
 #else
 #define MAYBE_DidStopLoadingDetailsWithPending DidStopLoadingDetailsWithPending
 #endif
 
 // Test that DidStopLoading includes the correct URL in the details when a
 // pending entry is present.
 IN_PROC_BROWSER_TEST_F(WebContentsImplBrowserTest,
                        MAYBE_DidStopLoadingDetailsWithPending) {
-  ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
+  ASSERT_TRUE(embedded_test_server()->Start());
   GURL url("data:text/html,<div>test</div>");
 
   // Listen for the first load to stop.
   LoadStopNotificationObserver load_observer(
       &shell()->web_contents()->GetController());
   // Start a new pending navigation as soon as the first load commits.
   // We will hear a DidStopLoading from the first load as the new load
   // is started.
   NavigateOnCommitObserver commit_observer(
       shell(), embedded_test_server()->GetURL("/title2.html"));
   NavigateToURL(shell(), url);
   load_observer.Wait();
 
   EXPECT_EQ(url, load_observer.url_);
   EXPECT_EQ(0, load_observer.session_index_);
   EXPECT_EQ(&shell()->web_contents()->GetController(),
             load_observer.controller_);
 }
 // Test that a renderer-initiated navigation to an invalid URL does not leave
 // around a pending entry that could be used in a URL spoof.  We test this in
 // a browser test because our unit test framework incorrectly calls
 // DidStartProvisionalLoadForFrame for in-page navigations.
 // See http://crbug.com/280512.
 IN_PROC_BROWSER_TEST_F(WebContentsImplBrowserTest,
                        ClearNonVisiblePendingOnFail) {
-  ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
+  ASSERT_TRUE(embedded_test_server()->Start());
 
   NavigateToURL(shell(), embedded_test_server()->GetURL("/title1.html"));
 
   // Navigate to an invalid URL and make sure it doesn't leave a pending entry.
   LoadStopNotificationObserver load_observer1(
       &shell()->web_contents()->GetController());
   ASSERT_TRUE(ExecuteScript(shell()->web_contents(),
                             "window.location.href=\"nonexistent:12121\";"));
   load_observer1.Wait();
   EXPECT_FALSE(shell()->web_contents()->GetController().GetPendingEntry());
@@ skipping 11 matching lines @@
 #if defined(OS_WIN) || defined(OS_ANDROID) \
     || defined(THREAD_SANITIZER)
 #define MAYBE_GetSizeForNewRenderView DISABLED_GetSizeForNewRenderView
 #else
 #define MAYBE_GetSizeForNewRenderView GetSizeForNewRenderView
 #endif
 // Test that RenderViewHost is created and updated at the size specified by
 // WebContentsDelegate::GetSizeForNewRenderView().
 IN_PROC_BROWSER_TEST_F(WebContentsImplBrowserTest,
                        MAYBE_GetSizeForNewRenderView) {
-  ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
+  ASSERT_TRUE(embedded_test_server()->Start());
   // Create a new server with a different site.
-  net::SpawnedTestServer https_server(
-      net::SpawnedTestServer::TYPE_HTTPS,
-      net::SpawnedTestServer::kLocalhost,
-      base::FilePath(FILE_PATH_LITERAL("content/test/data")));
+  net::EmbeddedTestServer https_server(net::EmbeddedTestServer::TYPE_HTTPS);
+  https_server.ServeFilesFromSourceDirectory("content/test/data");
   ASSERT_TRUE(https_server.Start());
 
   scoped_ptr<RenderViewSizeDelegate> delegate(new RenderViewSizeDelegate());
   shell()->web_contents()->SetDelegate(delegate.get());
   ASSERT_TRUE(shell()->web_contents()->GetDelegate() == delegate.get());
 
   // When no size is set, RenderWidgetHostView adopts the size of
   // WebContentsView.
   NavigateToURL(shell(), embedded_test_server()->GetURL("/title2.html"));
   EXPECT_EQ(shell()->web_contents()->GetContainerBounds().size(),
@@ skipping 69 matching lines @@
       shell()->web_contents()->GetController().GetLastCommittedEntry());
   SiteInstance* site_instance2 = entry2->site_instance();
   EXPECT_NE(site_instance1, site_instance2);
 
   EXPECT_EQ(2, shell()->web_contents()->GetController().GetEntryCount());
   EXPECT_EQ(base::ASCIIToUTF16("B"), entry1->GetTitle());
 }
 
 IN_PROC_BROWSER_TEST_F(WebContentsImplBrowserTest, OpenURLSubframe) {
   // Navigate to a page with frames and grab a subframe's FrameTreeNode ID.
-  ASSERT_TRUE(test_server()->Start());
+  ASSERT_TRUE(embedded_test_server()->Start());
   NavigateToURL(shell(),
-                test_server()->GetURL("files/frame_tree/top.html"));
+                embedded_test_server()->GetURL("/frame_tree/top.html"));
   WebContentsImpl* wc = static_cast<WebContentsImpl*>(shell()->web_contents());
   FrameTreeNode* root = wc->GetFrameTree()->root();
   ASSERT_EQ(3UL, root->child_count());
   int frame_tree_node_id = root->child_at(0)->frame_tree_node_id();
   EXPECT_NE(-1, frame_tree_node_id);
 
   // Navigate with the subframe's FrameTreeNode ID.
-  const GURL url(test_server()->GetURL("files/title1.html"));
+  const GURL url(embedded_test_server()->GetURL("/title1.html"));
   OpenURLParams params(url, Referrer(), frame_tree_node_id, CURRENT_TAB,
                        ui::PAGE_TRANSITION_LINK, true);
   shell()->web_contents()->OpenURL(params);
 
   // Make sure the NavigationEntry ends up with the FrameTreeNode ID.
   NavigationController* controller = &shell()->web_contents()->GetController();
   EXPECT_TRUE(controller->GetPendingEntry());
   EXPECT_EQ(frame_tree_node_id,
             NavigationEntryImpl::FromNavigationEntry(
                 controller->GetPendingEntry())->frame_tree_node_id());
@@ skipping 38 matching lines @@
 IN_PROC_BROWSER_TEST_F(WebContentsImplBrowserTest,
                        RenderFrameCreatedCorrectProcessForObservers) {
   static const char kFooCom[] = "foo.com";
   GURL::Replacements replace_host;
   net::HostPortPair foo_host_port;
   GURL cross_site_url;
 
   // Setup the server to allow serving separate sites, so we can perform
   // cross-process navigation.
   host_resolver()->AddRule("*", "127.0.0.1");
-  ASSERT_TRUE(test_server()->Start());
+  ASSERT_TRUE(embedded_test_server()->Start());
 
-  foo_host_port = test_server()->host_port_pair();
+  foo_host_port = embedded_test_server()->host_port_pair();
   foo_host_port.set_host(kFooCom);
 
-  GURL initial_url(test_server()->GetURL("/title1.html"));
+  GURL initial_url(embedded_test_server()->GetURL("/title1.html"));
 
-  cross_site_url = test_server()->GetURL("/title2.html");
+  cross_site_url = embedded_test_server()->GetURL("/title2.html");
   replace_host.SetHostStr(kFooCom);
   cross_site_url = cross_site_url.ReplaceComponents(replace_host);
 
   // Navigate to the initial URL and capture the RenderFrameHost for later
   // comparison.
   NavigateToURL(shell(), initial_url);
   RenderFrameHost* orig_rfh = shell()->web_contents()->GetMainFrame();
 
   // Install the observer and navigate cross-site.
   RenderFrameCreatedObserver observer(shell());
   NavigateToURL(shell(), cross_site_url);
 
   // The observer should've seen a RenderFrameCreated call for the new frame
   // and not the old one.
   EXPECT_NE(observer.last_rfh(), orig_rfh);
   EXPECT_EQ(observer.last_rfh(), shell()->web_contents()->GetMainFrame());
 }
 
 IN_PROC_BROWSER_TEST_F(WebContentsImplBrowserTest,
                        LoadingStateChangedForSameDocumentNavigation) {
-  ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
+  ASSERT_TRUE(embedded_test_server()->Start());
   scoped_ptr<LoadingStateChangedDelegate> delegate(
       new LoadingStateChangedDelegate());
   shell()->web_contents()->SetDelegate(delegate.get());
 
   LoadStopNotificationObserver load_observer(
       &shell()->web_contents()->GetController());
   TitleWatcher title_watcher(shell()->web_contents(),
                              base::ASCIIToUTF16("pushState"));
   NavigateToURL(shell(), embedded_test_server()->GetURL("/push_state.html"));
   load_observer.Wait();
   base::string16 title = title_watcher.WaitAndGetTitle();
   ASSERT_EQ(title, base::ASCIIToUTF16("pushState"));
 
   // LoadingStateChanged should be called 4 times: start and stop for the
   // initial load of push_state.html, and start and stop for the "navigation"
   // triggered by history.pushState(). However, the start notification for the
   // history.pushState() navigation should set to_different_document to false.
   EXPECT_EQ("pushState", shell()->web_contents()->GetLastCommittedURL().ref());
   EXPECT_EQ(4, delegate->loadingStateChangedCount());
   EXPECT_EQ(3, delegate->loadingStateToDifferentDocumentCount());
 }
 
 IN_PROC_BROWSER_TEST_F(WebContentsImplBrowserTest,
                        RenderViewCreatedForChildWindow) {
-  ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
+  ASSERT_TRUE(embedded_test_server()->Start());
 
   NavigateToURL(shell(),
                 embedded_test_server()->GetURL("/title1.html"));
 
   WebContentsAddedObserver new_web_contents_observer;
   ASSERT_TRUE(ExecuteScript(shell()->web_contents(),
                             "var a = document.createElement('a');"
                             "a.href='./title2.html';"
                             "a.target = '_blank';"
                             "document.body.appendChild(a);"
@@ skipping 33 matching lines @@
     EXPECT_FALSE(did_stop_loading);
     did_stop_loading = true;
   }
 
   bool did_start_loading;
   std::vector<double> progresses;
   bool did_stop_loading;
 };
 
 IN_PROC_BROWSER_TEST_F(WebContentsImplBrowserTest, LoadProgress) {
-  ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
+  ASSERT_TRUE(embedded_test_server()->Start());
   scoped_ptr<LoadProgressDelegateAndObserver> delegate(
       new LoadProgressDelegateAndObserver(shell()));
 
   NavigateToURL(shell(), embedded_test_server()->GetURL("/title1.html"));
 
   const std::vector<double>& progresses = delegate->progresses;
   // All updates should be in order ...
   if (std::adjacent_find(progresses.begin(),
                          progresses.end(),
                          std::greater<double>()) != progresses.end()) {
     ADD_FAILURE() << "Progress values should be in order: "
                   << ::testing::PrintToString(progresses);
   }
 
   // ... and the last one should be 1.0, meaning complete.
   ASSERT_GE(progresses.size(), 1U)
       << "There should be at least one progress update";
   EXPECT_EQ(1.0, *progresses.rbegin());
 }
 
 IN_PROC_BROWSER_TEST_F(WebContentsImplBrowserTest, LoadProgressWithFrames) {
-  ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
+  ASSERT_TRUE(embedded_test_server()->Start());
   scoped_ptr<LoadProgressDelegateAndObserver> delegate(
       new LoadProgressDelegateAndObserver(shell()));
 
   NavigateToURL(shell(),
                 embedded_test_server()->GetURL("/frame_tree/top.html"));
 
   const std::vector<double>& progresses = delegate->progresses;
   // All updates should be in order ...
   if (std::adjacent_find(progresses.begin(),
                          progresses.end(),
                          std::greater<double>()) != progresses.end()) {
     ADD_FAILURE() << "Progress values should be in order: "
                   << ::testing::PrintToString(progresses);
   }
 
   // ... and the last one should be 1.0, meaning complete.
   ASSERT_GE(progresses.size(), 1U)
       << "There should be at least one progress update";
   EXPECT_EQ(1.0, *progresses.rbegin());
 }
 
 // Ensure that a new navigation that interrupts a pending one will still fire
 // a DidStopLoading.  See http://crbug.com/429399.
 IN_PROC_BROWSER_TEST_F(WebContentsImplBrowserTest,
                        LoadProgressAfterInterruptedNav) {
   host_resolver()->AddRule("*", "127.0.0.1");
-  ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
+  ASSERT_TRUE(embedded_test_server()->Start());
 
   // Start at a real page.
   NavigateToURL(shell(), embedded_test_server()->GetURL("/title1.html"));
 
   // Simulate a navigation that has not completed.
   scoped_ptr<LoadProgressDelegateAndObserver> delegate(
       new LoadProgressDelegateAndObserver(shell()));
   RenderFrameHost* main_frame = shell()->web_contents()->GetMainFrame();
   FrameHostMsg_DidStartLoading start_msg(main_frame->GetRoutingID(), true);
   static_cast<RenderFrameHostImpl*>(main_frame)->OnMessageReceived(start_msg);
@@ skipping 43 matching lines @@
 
 // See: http://crbug.com/395664
 #if defined(OS_ANDROID)
 #define MAYBE_FirstVisuallyNonEmptyPaint DISABLED_FirstVisuallyNonEmptyPaint
 #else
 // http://crbug.com/398471
 #define MAYBE_FirstVisuallyNonEmptyPaint DISABLED_FirstVisuallyNonEmptyPaint
 #endif
 IN_PROC_BROWSER_TEST_F(WebContentsImplBrowserTest,
                        MAYBE_FirstVisuallyNonEmptyPaint) {
-  ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
+  ASSERT_TRUE(embedded_test_server()->Start());
   scoped_ptr<FirstVisuallyNonEmptyPaintObserver> observer(
       new FirstVisuallyNonEmptyPaintObserver(shell()));
 
   NavigateToURL(shell(), embedded_test_server()->GetURL("/title1.html"));
 
   observer->WaitForDidFirstVisuallyNonEmptyPaint();
   ASSERT_TRUE(observer->did_fist_visually_non_empty_paint_);
 }
 
 namespace {
 
 class WebDisplayModeDelegate : public WebContentsDelegate {
  public:
   explicit WebDisplayModeDelegate(blink::WebDisplayMode mode) : mode_(mode) { }
   ~WebDisplayModeDelegate() override { }
 
   blink::WebDisplayMode GetDisplayMode(
       const WebContents* source) const override { return mode_; }
   void set_mode(blink::WebDisplayMode mode) { mode_ = mode; }
  private:
   blink::WebDisplayMode mode_;
 
   DISALLOW_COPY_AND_ASSIGN(WebDisplayModeDelegate);
 };
 
 }
 
 IN_PROC_BROWSER_TEST_F(WebContentsImplBrowserTest, ChangeDisplayMode) {
-  ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
+  ASSERT_TRUE(embedded_test_server()->Start());
   WebDisplayModeDelegate delegate(blink::WebDisplayModeMinimalUi);
   shell()->web_contents()->SetDelegate(&delegate);
 
   NavigateToURL(shell(), GURL("about://blank"));
 
   ASSERT_TRUE(ExecuteScript(shell()->web_contents(),
                             "document.title = "
                             " window.matchMedia('(display-mode:"
                             " minimal-ui)').matches"));
   EXPECT_EQ(base::ASCIIToUTF16("true"), shell()->web_contents()->GetTitle());
 
   delegate.set_mode(blink::WebDisplayModeFullscreen);
   // Simulate widget is entering fullscreen (changing size is enough).
   shell()->web_contents()->GetRenderViewHost()->GetWidget()->WasResized();
 
   ASSERT_TRUE(ExecuteScript(shell()->web_contents(),
                             "document.title = "
                             " window.matchMedia('(display-mode:"
                             " fullscreen)').matches"));
   EXPECT_EQ(base::ASCIIToUTF16("true"), shell()->web_contents()->GetTitle());
 }
 
 IN_PROC_BROWSER_TEST_F(WebContentsImplBrowserTest, NewNamedWindow) {
-  ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
+  ASSERT_TRUE(embedded_test_server()->Start());
 
   GURL url = embedded_test_server()->GetURL("/click-noreferrer-links.html");
   EXPECT_TRUE(NavigateToURL(shell(), url));
 
   {
     ShellAddedObserver new_shell_observer;
 
     // Open a new, named window.
     EXPECT_TRUE(ExecuteScript(shell()->web_contents(),
                               "window.open('about:blank','new_window');"));
@@ skipping 27 matching lines @@
     Shell* new_shell = new_shell_observer.GetShell();
     WaitForLoadStop(new_shell->web_contents());
 
     EXPECT_EQ("foo",
               static_cast<WebContentsImpl*>(new_shell->web_contents())
                   ->GetFrameTree()->root()->frame_name());
   }
 }
 
 }  // namespace content