GTTF: convert some tests in chrome to use EmbeddedTestServer patch nr 1

chrome/browser/extensions/process_management_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/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/site_instance.h"
 #include "content/public/browser/web_contents.h"
 #include "net/dns/mock_host_resolver.h"
+#include "net/test/embedded_test_server/embedded_test_server.h"
 
 using content::NavigationController;
 using content::WebContents;
 
 namespace {
 
 class ProcessManagementTest : public ExtensionBrowserTest {
  private:
   // This is needed for testing isolated apps, which are still experimental.
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
@@ skipping 13 matching lines @@
 #endif
 
 // Ensure that an isolated app never shares a process with WebUIs, non-isolated
 // extensions, and normal webpages.  None of these should ever comingle
 // RenderProcessHosts even if we hit the process limit.
 IN_PROC_BROWSER_TEST_F(ProcessManagementTest, MAYBE_ProcessOverflow) {
   // Set max renderers to 1 to force running out of processes.
   content::RenderProcessHost::SetMaxRendererProcessCount(1);
 
   host_resolver()->AddRule("*", "127.0.0.1");
-  ASSERT_TRUE(test_server()->Start());
+  ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
 
   ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("isolated_apps/app1")));
   ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("isolated_apps/app2")));
   ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("hosted_app")));
   ASSERT_TRUE(
       LoadExtension(test_data_dir_.AppendASCII("api_test/app_process")));
 
   // The app under test acts on URLs whose host is "localhost",
   // so the URLs we navigate to must have host "localhost".
-  GURL base_url = test_server()->GetURL(
-      "files/extensions/");
+  GURL base_url = embedded_test_server()->GetURL(
+      "/extensions/");
   GURL::Replacements replace_host;
   std::string host_str("localhost");  // Must stay in scope with replace_host.
   replace_host.SetHostStr(host_str);
   base_url = base_url.ReplaceComponents(replace_host);
 
   // Load an extension before adding tabs.
   const extensions::Extension* extension1 = LoadExtension(
       test_data_dir_.AppendASCII("api_test/browser_action/basics"));
   ASSERT_TRUE(extension1);
   GURL extension1_url = extension1->url();
@@ skipping 109 matching lines @@
 #define MAYBE_ExtensionProcessBalancing ExtensionProcessBalancing
 #endif
 // Test to verify that the policy of maximum share of extension processes is
 // properly enforced.
 IN_PROC_BROWSER_TEST_F(ProcessManagementTest, MAYBE_ExtensionProcessBalancing) {
   // Set max renderers to 6 so we can expect 2 extension processes to be
   // allocated.
   content::RenderProcessHost::SetMaxRendererProcessCount(6);
 
   host_resolver()->AddRule("*", "127.0.0.1");
-  ASSERT_TRUE(test_server()->Start());
+  ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
 
   // The app under test acts on URLs whose host is "localhost",
   // so the URLs we navigate to must have host "localhost".
-  GURL base_url = test_server()->GetURL(
-      "files/extensions/");
+  GURL base_url = embedded_test_server()->GetURL(
+      "/extensions/");
   GURL::Replacements replace_host;
   std::string host_str("localhost");  // Must stay in scope with replace_host.
   replace_host.SetHostStr(host_str);
   base_url = base_url.ReplaceComponents(replace_host);
 
   ASSERT_TRUE(LoadExtension(
       test_data_dir_.AppendASCII("api_test/browser_action/none")));
   ASSERT_TRUE(LoadExtension(
       test_data_dir_.AppendASCII("api_test/browser_action/basics")));
   ASSERT_TRUE(LoadExtension(
@@ skipping 27 matching lines @@
 
   // We've loaded 5 extensions with background pages, 1 extension without
   // background page, and one isolated app. We expect only 2 unique processes
   // hosting those extensions.
   ExtensionService* service =
       extensions::ExtensionSystem::Get(profile)->extension_service();
 
   EXPECT_GE((size_t) 6, service->process_map()->size());
   EXPECT_EQ((size_t) 2, process_ids.size());
 }