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

chrome/browser/extensions/app_background_page_apitest.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/background/background_contents_service.h"
 #include "chrome/browser/background/background_contents_service_factory.h"
 #include "chrome/browser/background/background_mode_manager.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/test/test_notification_tracker.h"
 #include "content/public/test/test_utils.h"
 #include "net/dns/mock_host_resolver.h"
+#include "net/test/embedded_test_server/embedded_test_server.h"
 
 #if defined(OS_MACOSX)
 #include "base/mac/scoped_nsautorelease_pool.h"
 #endif
 
 using extensions::Extension;
 
 class AppBackgroundPageApiTest : public ExtensionApiTest {
  public:
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
@@ skipping 91 matching lines @@
       "  \"app\": {"
       "    \"urls\": ["
       "      \"http://a.com/\""
       "    ],"
       "    \"launch\": {"
       "      \"web_url\": \"http://a.com:%d/\""
       "    }"
       "  },"
       "  \"permissions\": [\"background\"]"
       "}",
-      test_server()->host_port_pair().port());
+      embedded_test_server()->port());
 
   base::FilePath app_dir;
   ASSERT_TRUE(CreateApp(app_manifest, &app_dir));
   ASSERT_TRUE(LoadExtension(app_dir));
   // Background mode should not be active until a background page is created.
   ASSERT_TRUE(WaitForBackgroundMode(false));
   ASSERT_TRUE(RunExtensionTest("app_background_page/basic")) << message_;
   // The test closes the background contents, so we should fall back to no
   // background mode at the end.
   ASSERT_TRUE(WaitForBackgroundMode(false));
@@ skipping 11 matching lines @@
       "  \"manifest_version\": 2,"
       "  \"app\": {"
       "    \"urls\": ["
       "      \"http://a.com/\""
       "    ],"
       "    \"launch\": {"
       "      \"web_url\": \"http://a.com:%d/\""
       "    }"
       "  }"
       "}",
-      test_server()->host_port_pair().port());
+      embedded_test_server()->port());
 
   base::FilePath app_dir;
   ASSERT_TRUE(CreateApp(app_manifest, &app_dir));
   ASSERT_TRUE(LoadExtension(app_dir));
   ASSERT_TRUE(RunExtensionTest("app_background_page/lacks_permission"))
       << message_;
   ASSERT_TRUE(WaitForBackgroundMode(false));
 }
 
 IN_PROC_BROWSER_TEST_F(AppBackgroundPageApiTest, ManifestBackgroundPage) {
@@ skipping 11 matching lines @@
       "    ],"
       "    \"launch\": {"
       "      \"web_url\": \"http://a.com:%d/\""
       "    }"
       "  },"
       "  \"permissions\": [\"background\"],"
       "  \"background\": {"
       "    \"page\": \"http://a.com:%d/test.html\""
       "  }"
       "}",
-      test_server()->host_port_pair().port(),
-      test_server()->host_port_pair().port());
+      embedded_test_server()->port(),
+      embedded_test_server()->port());
 
   base::FilePath app_dir;
   ASSERT_TRUE(CreateApp(app_manifest, &app_dir));
   // Background mode should not be active now because no background app was
   // loaded.
   ASSERT_TRUE(LoadExtension(app_dir));
   // Background mode be active now because a background page was created when
   // the app was loaded.
   ASSERT_TRUE(WaitForBackgroundMode(true));
 
@@ skipping 26 matching lines @@
       "    ],"
       "    \"launch\": {"
       "      \"web_url\": \"http://a.com:%d/test.html\""
       "    }"
       "  },"
       "  \"permissions\": [\"background\"],"
       "  \"background\": {"
       "    \"allow_js_access\": false"
       "  }"
       "}",
-      test_server()->host_port_pair().port());
+      embedded_test_server()->port());
 
   base::FilePath app_dir;
   ASSERT_TRUE(CreateApp(app_manifest, &app_dir));
   ASSERT_TRUE(LoadExtension(app_dir));
 
   // There isn't a background page loaded initially.
   const Extension* extension = GetSingleLoadedExtension();
   ASSERT_FALSE(
       BackgroundContentsServiceFactory::GetForProfile(browser()->profile())->
           GetAppBackgroundContents(ASCIIToUTF16(extension->id())));
@@ skipping 24 matching lines @@
       "    \"launch\": {"
       "      \"web_url\": \"http://a.com:%d/\""
       "    }"
       "  },"
       "  \"permissions\": [\"background\"],"
       "  \"background\": {"
       "    \"page\": \"http://a.com:%d/bg.html\","
       "    \"allow_js_access\": false"
       "  }"
       "}",
-      test_server()->host_port_pair().port(),
-      test_server()->host_port_pair().port());
+      embedded_test_server()->port(),
+      embedded_test_server()->port());
 
   base::FilePath app_dir;
   ASSERT_TRUE(CreateApp(app_manifest, &app_dir));
   ASSERT_TRUE(LoadExtension(app_dir));
 
   // The background page should load, but window.open should return null.
   const Extension* extension = GetSingleLoadedExtension();
   ASSERT_TRUE(
       BackgroundContentsServiceFactory::GetForProfile(browser()->profile())->
           GetAppBackgroundContents(ASCIIToUTF16(extension->id())));
@@ skipping 14 matching lines @@
       "  \"app\": {"
       "    \"urls\": ["
       "      \"http://a.com/\""
       "    ],"
       "    \"launch\": {"
       "      \"web_url\": \"http://a.com:%d/\""
       "    }"
       "  },"
       "  \"permissions\": [\"background\"]"
       "}",
-      test_server()->host_port_pair().port());
+      embedded_test_server()->port());
 
   base::FilePath app_dir;
   ASSERT_TRUE(CreateApp(app_manifest, &app_dir));
   ASSERT_TRUE(LoadExtension(app_dir));
   const Extension* extension = GetSingleLoadedExtension();
   ASSERT_TRUE(RunExtensionTest("app_background_page/two_pages")) << message_;
   UnloadExtension(extension->id());
 }
 
 IN_PROC_BROWSER_TEST_F(AppBackgroundPageApiTest, OpenTwoPagesWithManifest) {
@@ skipping 11 matching lines @@
       "    ],"
       "    \"launch\": {"
       "      \"web_url\": \"http://a.com:%d/\""
       "    }"
       "  },"
       "  \"background\": {"
       "    \"page\": \"http://a.com:%d/bg.html\""
       "  },"
       "  \"permissions\": [\"background\"]"
       "}",
-      test_server()->host_port_pair().port(),
-      test_server()->host_port_pair().port());
+      embedded_test_server()->port(),
+      embedded_test_server()->port());
 
   base::FilePath app_dir;
   ASSERT_TRUE(CreateApp(app_manifest, &app_dir));
   ASSERT_TRUE(LoadExtension(app_dir));
   const Extension* extension = GetSingleLoadedExtension();
   ASSERT_TRUE(RunExtensionTest("app_background_page/two_with_manifest")) <<
       message_;
   UnloadExtension(extension->id());
 }
 
 // Times out occasionally -- see crbug.com/108493
 IN_PROC_BROWSER_TEST_F(AppBackgroundPageApiTest, DISABLED_OpenPopupFromBGPage) {
   host_resolver()->AddRule("a.com", "127.0.0.1");
   ASSERT_TRUE(StartTestServer());
 
   std::string app_manifest = base::StringPrintf(
       "{"
       "  \"name\": \"App\","
       "  \"version\": \"0.1\","
       "  \"manifest_version\": 2,"
       "  \"app\": {"
       "    \"urls\": ["
       "      \"http://a.com/\""
       "    ],"
       "    \"launch\": {"
       "      \"web_url\": \"http://a.com:%d/\""
       "    }"
       "  },"
-      "  \"background\": { \"page\": \"http://a.com:%d/files/extensions/api_test/"
+      "  \"background\": { \"page\": \"http://a.com:%d/extensions/api_test/"
       "app_background_page/bg_open/bg_open_bg.html\" },"
       "  \"permissions\": [\"background\"]"
       "}",
-      test_server()->host_port_pair().port(),
-      test_server()->host_port_pair().port());
+      embedded_test_server()->port(),
+      embedded_test_server()->port());
 
   base::FilePath app_dir;
   ASSERT_TRUE(CreateApp(app_manifest, &app_dir));
   ASSERT_TRUE(LoadExtension(app_dir));
   ASSERT_TRUE(RunExtensionTest("app_background_page/bg_open")) << message_;
 }
 
 IN_PROC_BROWSER_TEST_F(AppBackgroundPageApiTest, DISABLED_OpenThenClose) {
   host_resolver()->AddRule("a.com", "127.0.0.1");
   ASSERT_TRUE(StartTestServer());
 
   std::string app_manifest = base::StringPrintf(
       "{"
       "  \"name\": \"App\","
       "  \"version\": \"0.1\","
       "  \"manifest_version\": 2,"
       "  \"app\": {"
       "    \"urls\": ["
       "      \"http://a.com/\""
       "    ],"
       "    \"launch\": {"
       "      \"web_url\": \"http://a.com:%d/\""
       "    }"
       "  },"
       "  \"permissions\": [\"background\"]"
       "}",
-      test_server()->host_port_pair().port());
+      embedded_test_server()->port());
 
   base::FilePath app_dir;
   ASSERT_TRUE(CreateApp(app_manifest, &app_dir));
   ASSERT_TRUE(LoadExtension(app_dir));
   // There isn't a background page loaded initially.
   const Extension* extension = GetSingleLoadedExtension();
   ASSERT_FALSE(
       BackgroundContentsServiceFactory::GetForProfile(browser()->profile())->
           GetAppBackgroundContents(ASCIIToUTF16(extension->id())));
   // Background mode should not be active until a background page is created.
@@ skipping 28 matching lines @@
       "    ],"
       "    \"launch\": {"
       "      \"web_url\": \"http://a.com:%d/\""
       "    }"
       "  },"
       "  \"permissions\": [\"background\"],"
       "  \"background\": {"
       "    \"page\": \"http://a.com:%d/test.html\""
       "  }"
       "}",
-      test_server()->host_port_pair().port(),
-      test_server()->host_port_pair().port());
+      embedded_test_server()->port(),
+      embedded_test_server()->port());
 
   base::FilePath app_dir;
   ASSERT_TRUE(CreateApp(app_manifest, &app_dir));
   // Background mode should not be active now because no background app was
   // loaded.
   ASSERT_TRUE(LoadExtension(app_dir));
   // Background mode be active now because a background page was created when
   // the app was loaded.
   ASSERT_TRUE(WaitForBackgroundMode(true));
 
   const Extension* extension = GetSingleLoadedExtension();
   ASSERT_TRUE(
       BackgroundContentsServiceFactory::GetForProfile(browser()->profile())->
           GetAppBackgroundContents(ASCIIToUTF16(extension->id())));
 
   // Close all browsers - app should continue running.
   set_exit_when_last_browser_closes(false);
   CloseBrowser(browser());
 
   // Post a task to unload the extension - this should cause Chrome to exit
   // cleanly (not crash).
   UnloadExtensionViaTask(extension->id());
   content::RunAllPendingInMessageLoop();
   ASSERT_TRUE(WaitForBackgroundMode(false));
 }