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

chrome/browser/media/chrome_media_stream_infobar_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/command_line.h"
 #include "base/files/file_util.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/media/media_stream_devices_controller.h"
@@ skipping 10 matching lines @@
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/content_settings/core/common/content_settings_types.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/media_stream_request.h"
 #include "content/public/common/origin_util.h"
 #include "content/public/test/browser_test_utils.h"
 #include "media/base/media_switches.h"
 #include "net/dns/mock_host_resolver.h"
-#include "net/test/spawned_test_server/spawned_test_server.h"
+#include "net/test/embedded_test_server/embedded_test_server.h"
 
 // MediaStreamPermissionTest ---------------------------------------------------
 
 class MediaStreamPermissionTest : public WebRtcTestBase {
  public:
   MediaStreamPermissionTest() {}
   ~MediaStreamPermissionTest() override {}
 
   // InProcessBrowserTest:
   void SetUpCommandLine(base::CommandLine* command_line) override {
     // This test expects to run with fake devices but real UI.
     command_line->AppendSwitch(switches::kUseFakeDeviceForMediaStream);
     EXPECT_FALSE(command_line->HasSwitch(switches::kUseFakeUIForMediaStream))
         << "Since this test tests the UI we want the real UI!";
   }
 
  protected:
   content::WebContents* LoadTestPageInTab() {
     return LoadTestPageInBrowser(browser());
   }
 
   content::WebContents* LoadTestPageInIncognitoTab() {
     return LoadTestPageInBrowser(CreateIncognitoBrowser());
   }
 
   // Returns the URL of the main test page.
   GURL test_page_url() const {
-    const char kMainWebrtcTestHtmlPage[] =
-        "files/webrtc/webrtc_jsep01_test.html";
-    return test_server()->GetURL(kMainWebrtcTestHtmlPage);
+    const char kMainWebrtcTestHtmlPage[] = "/webrtc/webrtc_jsep01_test.html";
+    return embedded_test_server()->GetURL(kMainWebrtcTestHtmlPage);
   }
 
  private:
   content::WebContents* LoadTestPageInBrowser(Browser* browser) {
-    EXPECT_TRUE(test_server()->Start());
+    EXPECT_TRUE(embedded_test_server()->Start());
 
     // Uses the default server.
     GURL url = test_page_url();
 
     EXPECT_TRUE(content::IsOriginSecure(url));
 
     ui_test_utils::NavigateToURL(browser, url);
     return browser->tab_strip_model()->GetActiveWebContents();
   }
 
@@ skipping 82 matching lines @@
 
 IN_PROC_BROWSER_TEST_F(MediaStreamPermissionTest,
                        DenyingCameraDoesNotCauseStickyDenyForMics) {
   content::WebContents* tab_contents = LoadTestPageInTab();
 
   GetUserMediaWithSpecificConstraintsAndDeny(tab_contents,
                                              kVideoOnlyCallConstraints);
   EXPECT_TRUE(GetUserMediaWithSpecificConstraintsAndAccept(
       tab_contents, kAudioOnlyCallConstraints));
 }