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

chrome/browser/extensions/isolated_app_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/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
@@ skipping 23 matching lines @@
 namespace extensions {
 
 namespace {
 
 std::string WrapForJavascriptAndExtract(const char* javascript_expression) {
   return std::string("window.domAutomationController.send(") +
       javascript_expression + ")";
 }
 
 scoped_ptr<net::test_server::HttpResponse> HandleExpectAndSetCookieRequest(
-    const net::test_server::EmbeddedTestServer* test_server,
+    const net::EmbeddedTestServer* test_server,
     const net::test_server::HttpRequest& request) {
   if (!base::StartsWith(request.relative_url, "/expect-and-set-cookie?",
                         base::CompareCase::SENSITIVE))
     return scoped_ptr<net::test_server::HttpResponse>();
 
   scoped_ptr<net::test_server::BasicHttpResponse> http_response(
       new net::test_server::BasicHttpResponse);
   http_response->set_code(net::HTTP_OK);
 
   std::string request_cookies;
@@ skipping 74 matching lines @@
 
  private:
   void SetUpCommandLine(base::CommandLine* command_line) override {
     ExtensionBrowserTest::SetUpCommandLine(command_line);
     command_line->AppendSwitch(switches::kEnableExperimentalExtensionApis);
   }
 };
 
 IN_PROC_BROWSER_TEST_F(IsolatedAppTest, CrossProcessClientRedirect) {
   host_resolver()->AddRule("*", "127.0.0.1");
-  ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
+  ASSERT_TRUE(embedded_test_server()->Start());
 
   ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("isolated_apps/app1")));
   ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("isolated_apps/app2")));
 
   GURL base_url = embedded_test_server()->GetURL("/extensions/isolated_apps/");
   GURL::Replacements replace_host;
   replace_host.SetHostStr("localhost");
   base_url = base_url.ReplaceComponents(replace_host);
   ui_test_utils::NavigateToURL(browser(), base_url.Resolve("app1/main.html"));
 
@@ skipping 48 matching lines @@
 // separation as you would expect.
 //
 // This test is disabled due to being flaky. http://crbug.com/86562
 #if defined(OS_WIN)
 #define MAYBE_CookieIsolation DISABLED_CookieIsolation
 #else
 #define MAYBE_CookieIsolation CookieIsolation
 #endif
 IN_PROC_BROWSER_TEST_F(IsolatedAppTest, MAYBE_CookieIsolation) {
   host_resolver()->AddRule("*", "127.0.0.1");
-  ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
+  ASSERT_TRUE(embedded_test_server()->Start());
 
   ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("isolated_apps/app1")));
   ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("isolated_apps/app2")));
 
   // The app under test acts on URLs whose host is "localhost",
   // so the URLs we navigate to must have host "localhost".
   GURL base_url = embedded_test_server()->GetURL("/extensions/isolated_apps/");
   GURL::Replacements replace_host;
   replace_host.SetHostStr("localhost");
   base_url = base_url.ReplaceComponents(replace_host);
@@ skipping 74 matching lines @@
   observer.Wait();
   EXPECT_TRUE(HasCookie(tab0, "app1=3"));
   EXPECT_FALSE(HasCookie(tab0, "app2"));
   EXPECT_FALSE(HasCookie(tab0, "normalPage"));
 }
 
 // This test is disabled due to being flaky. http://crbug.com/145588
 // Ensure that cookies are not isolated if the isolated apps are not installed.
 IN_PROC_BROWSER_TEST_F(IsolatedAppTest, DISABLED_NoCookieIsolationWithoutApp) {
   host_resolver()->AddRule("*", "127.0.0.1");
-  ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
+  ASSERT_TRUE(embedded_test_server()->Start());
 
   // The app under test acts on URLs whose host is "localhost",
   // so the URLs we navigate to must have host "localhost".
   GURL base_url = embedded_test_server()->GetURL("/extensions/isolated_apps/");
   GURL::Replacements replace_host;
   replace_host.SetHostStr("localhost");
   base_url = base_url.ReplaceComponents(replace_host);
 
   ui_test_utils::NavigateToURL(browser(), base_url.Resolve("app1/main.html"));
   ui_test_utils::NavigateToURLWithDisposition(
@@ skipping 58 matching lines @@
 #define MAYBE_SubresourceCookieIsolation SubresourceCookieIsolation
 #endif  // (defined(OS_WIN) && !defined(NDEBUG)) || defined(OS_MACOSX)
 
 // Tests that subresource and media requests use the app's cookie store.
 // See http://crbug.com/141172.
 IN_PROC_BROWSER_TEST_F(IsolatedAppTest, MAYBE_SubresourceCookieIsolation) {
   embedded_test_server()->RegisterRequestHandler(
       base::Bind(&HandleExpectAndSetCookieRequest, embedded_test_server()));
 
   host_resolver()->AddRule("*", "127.0.0.1");
-  ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
+  ASSERT_TRUE(embedded_test_server()->Start());
 
   ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("isolated_apps/app1")));
 
   // The app under test acts on URLs whose host is "localhost",
   // so the URLs we navigate to must have host "localhost".
   GURL root_url = embedded_test_server()->GetURL("/");
   GURL base_url = embedded_test_server()->GetURL("/extensions/isolated_apps/");
   GURL::Replacements replace_host;
   replace_host.SetHostStr("localhost");
   root_url = root_url.ReplaceComponents(replace_host);
@@ skipping 51 matching lines @@
 #define MAYBE_IsolatedAppProcessModel DISABLED_IsolatedAppProcessModel
 #else
 #define MAYBE_IsolatedAppProcessModel IsolatedAppProcessModel
 #endif  // defined(OS_WIN)
 
 // Tests that isolated apps processes do not render top-level non-app pages.
 // This is true even in the case of the OAuth workaround for hosted apps,
 // where non-app popups may be kept in the hosted app process.
 IN_PROC_BROWSER_TEST_F(IsolatedAppTest, MAYBE_IsolatedAppProcessModel) {
   host_resolver()->AddRule("*", "127.0.0.1");
-  ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
+  ASSERT_TRUE(embedded_test_server()->Start());
 
   ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("isolated_apps/app1")));
 
   // The app under test acts on URLs whose host is "localhost",
   // so the URLs we navigate to must have host "localhost".
   GURL base_url = embedded_test_server()->GetURL("/extensions/isolated_apps/");
   GURL::Replacements replace_host;
   replace_host.SetHostStr("localhost");
   base_url = base_url.ReplaceComponents(replace_host);
 
@@ skipping 36 matching lines @@
                 GetRenderProcessHost()->GetID());
 }
 
 // This test no longer passes, since we don't properly isolate sessionStorage
 // for isolated apps. This was broken as part of the changes for storage
 // partition support for webview tags.
 // TODO(nasko): If isolated apps is no longer developed, this test should be
 // removed. http://crbug.com/159932
 IN_PROC_BROWSER_TEST_F(IsolatedAppTest, DISABLED_SessionStorage) {
   host_resolver()->AddRule("*", "127.0.0.1");
-  ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
+  ASSERT_TRUE(embedded_test_server()->Start());
 
   ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("isolated_apps/app1")));
   ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("isolated_apps/app2")));
 
   // The app under test acts on URLs whose host is "localhost",
   // so the URLs we navigate to must have host "localhost".
   GURL base_url = embedded_test_server()->GetURL("/extensions/isolated_apps/");
   GURL::Replacements replace_host;
   replace_host.SetHostStr("localhost");
   base_url = base_url.ReplaceComponents(replace_host);
@@ skipping 38 matching lines @@
       browser(), base_url.Resolve("non_app/main.html"));
   ASSERT_TRUE(ExecuteScriptAndExtractString(
       browser()->tab_strip_model()->GetWebContentsAt(0),
       kRetrieveSessionStorage.c_str(), &result));
   EXPECT_EQ("ss_normal", result);
 }
 
 }  // namespace
 
 }  // namespace extensions