Migrating tests to use EmbeddedTestServer (/chrome/browser misc)

chrome/browser/dom_distiller/tab_utils_browsertest.cc

 // Copyright 2014 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 <string.h>
 
 #include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/dom_distiller/dom_distiller_service_factory.h"
 #include "chrome/browser/dom_distiller/tab_utils.h"
@@ skipping 76 matching lines @@
 };
 
 #if (defined(OS_LINUX) && defined(OS_CHROMEOS))
 #define MAYBE_TestSwapWebContents DISABLED_TestSwapWebContents
 #else
 #define MAYBE_TestSwapWebContents TestSwapWebContents
 #endif
 
 IN_PROC_BROWSER_TEST_F(DomDistillerTabUtilsBrowserTest,
                        MAYBE_TestSwapWebContents) {
-  ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
+  ASSERT_TRUE(embedded_test_server()->Start());
 
   content::WebContents* initial_web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
   const GURL& article_url = embedded_test_server()->GetURL(kSimpleArticlePath);
 
   // This blocks until the navigation has completely finished.
   ui_test_utils::NavigateToURL(browser(), article_url);
 
   DistillCurrentPageAndView(initial_web_contents);
 
@@ skipping 13 matching lines @@
 
   // Verify the new URL is showing distilled content in a new WebContents.
   EXPECT_NE(initial_web_contents, after_web_contents);
   EXPECT_TRUE(
       after_web_contents->GetLastCommittedURL().SchemeIs(kDomDistillerScheme));
   EXPECT_EQ("Test Page Title", page_title);
 }
 
 IN_PROC_BROWSER_TEST_F(DomDistillerTabUtilsBrowserTest,
                        TestDistillIntoWebContents) {
-  ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
+  ASSERT_TRUE(embedded_test_server()->Start());
 
   content::WebContents* source_web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
   const GURL& article_url = embedded_test_server()->GetURL(kSimpleArticlePath);
 
   // This blocks until the navigation has completely finished.
   ui_test_utils::NavigateToURL(browser(), article_url);
 
   // Create destination WebContents.
   content::WebContents::CreateParams create_params(
@@ skipping 30 matching lines @@
                                     "document.title")->GetAsString(&page_title);
   EXPECT_EQ("Test Page Title", page_title);
 
   content::WebContentsDestroyedWatcher destroyed_watcher(
       destination_web_contents);
   browser()->tab_strip_model()->CloseWebContentsAt(1, 0);
   destroyed_watcher.Wait();
 }
 
 }  // namespace dom_distiller