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

chrome/browser/geolocation/geolocation_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 <string>
 
 #include "base/compiler_specific.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 13 matching lines @@
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/dom_operation_notification_details.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/browser_test_utils.h"
 #include "net/base/net_util.h"
-#include "net/test/spawned_test_server/spawned_test_server.h"
+#include "net/test/embedded_test_server/embedded_test_server.h"
 
 using content::DomOperationNotificationDetails;
 using content::NavigationController;
 using content::WebContents;
 
 namespace {
 
 
 // IFrameLoader ---------------------------------------------------------------
 
@@ skipping 222 matching lines @@
   // This member defines the iframe (or top-level page, if empty) where the
   // javascript calls will run.
   std::string iframe_xpath_;
   // The current url for the top level page.
   GURL current_url_;
   // If not empty, the GURLs for the iframes loaded by LoadIFrames().
   std::vector<GURL> iframe_urls_;
   double fake_latitude_;
   double fake_longitude_;
 
-  // TODO(phajdan.jr): Remove after we can ask TestServer whether it is started.
-  bool started_test_server_;
-
  private:
   DISALLOW_COPY_AND_ASSIGN(GeolocationBrowserTest);
 };
 
 GeolocationBrowserTest::GeolocationBrowserTest()
   : infobar_(NULL),
     current_browser_(NULL),
-    html_for_tests_("files/geolocation/simple.html"),
+    html_for_tests_("/geolocation/simple.html"),
     fake_latitude_(1.23),
-    fake_longitude_(4.56),
-    started_test_server_(false) {}
+    fake_longitude_(4.56) {
+}
 
 void GeolocationBrowserTest::SetUpOnMainThread() {
   ui_test_utils::OverrideGeolocation(fake_latitude_, fake_longitude_);
 }
 
 void GeolocationBrowserTest::TearDownInProcessBrowserTestFixture() {
   LOG(WARNING) << "TearDownInProcessBrowserTestFixture. Test Finished.";
 }
 
 bool GeolocationBrowserTest::Initialize(InitializationOptions options) {
-  if (!started_test_server_)
-    started_test_server_ = test_server()->Start();
-  EXPECT_TRUE(started_test_server_);
-  if (!started_test_server_)
+  if (!embedded_test_server()->Started() &&
+      !embedded_test_server()->InitializeAndWaitUntilReady()) {
+    ADD_FAILURE() << "Test server failed to start.";
     return false;
+  }
 
-  current_url_ = test_server()->GetURL(html_for_tests_);
+  current_url_ = embedded_test_server()->GetURL(html_for_tests_);
   LOG(WARNING) << "before navigate";
   if (options == INITIALIZATION_OFFTHERECORD) {
     current_browser_ = ui_test_utils::OpenURLOffTheRecord(
         browser()->profile(), current_url_);
   } else if (options == INITIALIZATION_NEWTAB) {
     current_browser_ = browser();
     chrome::NewTab(current_browser_);
     ui_test_utils::NavigateToURL(current_browser_, current_url_);
   } else if (options == INITIALIZATION_IFRAMES) {
     current_browser_ = browser();
@@ skipping 215 matching lines @@
   // Go to the regular profile, infobar will be created.
   ASSERT_TRUE(Initialize(INITIALIZATION_NONE));
   AddGeolocationWatch(true);
   SetInfobarResponse(current_url_, false);
   CheckStringValueFromJavascript("1", "geoGetLastError()");
 }
 
 // crbug.com/176291
 IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest,
                        DISABLED_IFramesWithFreshPosition) {
-  html_for_tests_ = "files/geolocation/iframes_different_origin.html";
+  html_for_tests_ = "/geolocation/iframes_different_origin.html";
   ASSERT_TRUE(Initialize(INITIALIZATION_IFRAMES));
   LoadIFrames(2);
   LOG(WARNING) << "frames loaded";
 
   iframe_xpath_ = "//iframe[@id='iframe_0']";
   AddGeolocationWatch(true);
   SetInfobarResponse(iframe_urls_[0], true);
   CheckGeoposition(fake_latitude_, fake_longitude_);
   // Disables further prompts from this iframe.
   CheckStringValueFromJavascript("0", "geoSetMaxNavigateCount(0)");
@@ skipping 24 matching lines @@
   iframe_xpath_ = "//iframe[@id='iframe_1']";
   // Infobar was displayed, allow access and check there's no error code.
   SetInfobarResponse(iframe_urls_[1], true);
   LOG(WARNING) << "Checking position...";
   CheckGeoposition(fresh_position_latitude, fresh_position_longitude);
   LOG(WARNING) << "...done.";
 }
 
 IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest,
                        IFramesWithCachedPosition) {
-  html_for_tests_ = "files/geolocation/iframes_different_origin.html";
+  html_for_tests_ = "/geolocation/iframes_different_origin.html";
   ASSERT_TRUE(Initialize(INITIALIZATION_IFRAMES));
   LoadIFrames(2);
 
   iframe_xpath_ = "//iframe[@id='iframe_0']";
   AddGeolocationWatch(true);
   SetInfobarResponse(iframe_urls_[0], true);
   CheckGeoposition(fake_latitude_, fake_longitude_);
 
   // Refresh geoposition, but let's not yet create the watch on the second frame
   // so that it'll fetch from cache.
@@ skipping 18 matching lines @@
   // afterwards. We're only interested in the first navigation for the success
   // callback from the cached position.
   CheckStringValueFromJavascript("1", "geoSetMaxNavigateCount(1)");
   SetInfobarResponse(iframe_urls_[1], true);
   CheckGeoposition(cached_position_latitude, cached_position_lognitude);
 }
 
 // crbug.com/176291
 IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest,
                        DISABLED_CancelPermissionForFrame) {
-  html_for_tests_ = "files/geolocation/iframes_different_origin.html";
+  html_for_tests_ = "/geolocation/iframes_different_origin.html";
   ASSERT_TRUE(Initialize(INITIALIZATION_IFRAMES));
   LoadIFrames(2);
   LOG(WARNING) << "frames loaded";
 
   iframe_xpath_ = "//iframe[@id='iframe_0']";
   AddGeolocationWatch(true);
   SetInfobarResponse(iframe_urls_[0], true);
   CheckGeoposition(fake_latitude_, fake_longitude_);
   // Disables further prompts from this iframe.
   CheckStringValueFromJavascript("0", "geoSetMaxNavigateCount(0)");
 
   // Test second iframe from a different origin with a cached geoposition will
   // create the infobar.
   iframe_xpath_ = "//iframe[@id='iframe_1']";
   AddGeolocationWatch(true);
 
   InfoBarService* infobar_service = InfoBarService::FromWebContents(
       current_browser_->tab_strip_model()->GetActiveWebContents());
   size_t num_infobars_before_cancel = infobar_service->infobar_count();
   // Change the iframe, and ensure the infobar is gone.
   IFrameLoader change_iframe_1(current_browser_, 1, current_url_);
   size_t num_infobars_after_cancel = infobar_service->infobar_count();
   EXPECT_EQ(num_infobars_before_cancel, num_infobars_after_cancel + 1);
 }
 
 IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, InvalidUrlRequest) {
   // Tests that an invalid URL (e.g. from a popup window) is rejected
   // correctly. Also acts as a regression test for http://crbug.com/40478
-  html_for_tests_ = "files/geolocation/invalid_request_url.html";
+  html_for_tests_ = "/geolocation/invalid_request_url.html";
   ASSERT_TRUE(Initialize(INITIALIZATION_NONE));
   WebContents* original_tab =
       current_browser_->tab_strip_model()->GetActiveWebContents();
   CheckStringValueFromJavascript("1", "requestGeolocationFromInvalidUrl()");
   CheckStringValueFromJavascriptForTab("1", "isAlive()", original_tab);
 }
 
 IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, NoInfoBarBeforeStart) {
   // See http://crbug.com/42789
-  html_for_tests_ = "files/geolocation/iframes_different_origin.html";
+  html_for_tests_ = "/geolocation/iframes_different_origin.html";
   ASSERT_TRUE(Initialize(INITIALIZATION_IFRAMES));
   LoadIFrames(2);
   LOG(WARNING) << "frames loaded";
 
   // Access navigator.geolocation, but ensure it won't request permission.
   iframe_xpath_ = "//iframe[@id='iframe_1']";
   CheckStringValueFromJavascript("object", "geoAccessNavigatorGeolocation()");
 
   iframe_xpath_ = "//iframe[@id='iframe_0']";
   AddGeolocationWatch(true);
   SetInfobarResponse(iframe_urls_[0], true);
   CheckGeoposition(fake_latitude_, fake_longitude_);
   CheckStringValueFromJavascript("0", "geoSetMaxNavigateCount(0)");
 
   // Permission should be requested after adding a watch.
   iframe_xpath_ = "//iframe[@id='iframe_1']";
   AddGeolocationWatch(true);
   SetInfobarResponse(iframe_urls_[1], true);
   CheckGeoposition(fake_latitude_, fake_longitude_);
 }
 
 IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, TwoWatchesInOneFrame) {
-  html_for_tests_ = "files/geolocation/two_watches.html";
+  html_for_tests_ = "/geolocation/two_watches.html";
   ASSERT_TRUE(Initialize(INITIALIZATION_NONE));
   // First, set the JavaScript to navigate when it receives |final_position|.
   double final_position_latitude = 3.17;
   double final_position_longitude = 4.23;
   std::string script = base::StringPrintf(
       "window.domAutomationController.send(geoSetFinalPosition(%f, %f))",
       final_position_latitude, final_position_longitude);
   std::string js_result;
   EXPECT_TRUE(content::ExecuteScriptAndExtractString(
       current_browser_->tab_strip_model()->GetActiveWebContents(),
@@ skipping 13 matching lines @@
       content::Source<NavigationController>(
           &current_browser_->tab_strip_model()->GetActiveWebContents()->
               GetController()));
   NotifyGeoposition(final_position_latitude, final_position_longitude);
   observer.Wait();
   CheckGeoposition(final_position_latitude, final_position_longitude);
 }
 
 // crbug.com/176291
 IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, DISABLED_TabDestroyed) {
-  html_for_tests_ = "files/geolocation/tab_destroyed.html";
+  html_for_tests_ = "/geolocation/tab_destroyed.html";
   ASSERT_TRUE(Initialize(INITIALIZATION_IFRAMES));
   LoadIFrames(3);
 
   iframe_xpath_ = "//iframe[@id='iframe_0']";
   AddGeolocationWatch(true);
 
   iframe_xpath_ = "//iframe[@id='iframe_1']";
   AddGeolocationWatch(false);
 
   iframe_xpath_ = "//iframe[@id='iframe_2']";
   AddGeolocationWatch(false);
 
   std::string script =
       "window.domAutomationController.send(window.close());";
   bool result =
       content::ExecuteScript(
           current_browser_->tab_strip_model()->GetActiveWebContents(),
           script);
   EXPECT_EQ(result, true);
 }