Migrating tests to use EmbeddedTestServer (/content)

content/browser/download/mhtml_generation_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 "base/bind.h"
 #include "base/callback.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/run_loop.h"
@@ skipping 13 matching lines @@
 
 namespace content {
 
 class MHTMLGenerationTest : public ContentBrowserTest {
  public:
   MHTMLGenerationTest() : has_mhtml_callback_run_(false), file_size_(0) {}
 
  protected:
   void SetUp() override {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
-    ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
+    ASSERT_TRUE(embedded_test_server()->Start());
     ContentBrowserTest::SetUp();
   }
 
   void GenerateMHTML(const base::FilePath& path, const GURL& url) {
     NavigateToURL(shell(), url);
 
     base::RunLoop run_loop;
     shell()->web_contents()->GenerateMHTML(
         path, base::Bind(&MHTMLGenerationTest::MHTMLGenerated, this,
                          run_loop.QuitClosure()));
@@ skipping 93 matching lines @@
     MHTMLGenerationTest::SetUpCommandLine(command_line);
 
     // Append --site-per-process flag.
     content::IsolateAllSitesForTesting(command_line);
   }
 
   void SetUpOnMainThread() override {
     MHTMLGenerationTest::SetUpOnMainThread();
 
     host_resolver()->AddRule("*", "127.0.0.1");
-    ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
+    ASSERT_TRUE(embedded_test_server()->Start());
     content::SetupCrossSiteRedirector(embedded_test_server());
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MHTMLGenerationSitePerProcessTest);
 };
 
 // Test for crbug.com/538766.
 // Disabled because the test will fail until the bug is fixed
 // (but note that the test only fails with --site-per-process flag).
@@ skipping 16 matching lines @@
 
   // Make sure that URLs of both frames are present
   // (note that these are single-line regexes).
   EXPECT_THAT(
       mhtml,
       ContainsRegex("Content-Location:.*/frame_tree/page_with_one_frame.html"));
   EXPECT_THAT(mhtml, ContainsRegex("Content-Location:.*/title1.html"));
 }
 
 }  // namespace content