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

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 276 matching lines @@
 
 void GeolocationBrowserTest::SetUpOnMainThread() {
   ui_test_utils::OverrideGeolocation(fake_latitude_, fake_longitude_);
 }
 
 void GeolocationBrowserTest::TearDownInProcessBrowserTestFixture() {
   LOG(WARNING) << "TearDownInProcessBrowserTestFixture. Test Finished.";
 }
 
 void GeolocationBrowserTest::Initialize(InitializationOptions options) {
-  if (!embedded_test_server()->Started() &&
-      !embedded_test_server()->InitializeAndWaitUntilReady()) {
+  if (!embedded_test_server()->Started() && !embedded_test_server()->Start()) {
     ADD_FAILURE() << "Test server failed to start.";
     return;
   }
 
   current_url_ = embedded_test_server()->GetURL(html_for_tests_);
   if (options == INITIALIZATION_OFFTHERECORD) {
     current_browser_ = OpenURLOffTheRecord(browser()->profile(), current_url_);
   } else {
     current_browser_ = browser();
     if (options == INITIALIZATION_NEWTAB)
@@ skipping 452 matching lines @@
   // Calling watchPosition should trigger the last usage update.
   WatchPositionAndObservePermissionBubble(false);
   ExpectPosition(fake_latitude(), fake_longitude());
 
   // Last usage has been updated.
   EXPECT_EQ(GetHostContentSettingsMap()->GetLastUsage(
       current_url().GetOrigin(),
       current_url().GetOrigin(),
       CONTENT_SETTINGS_TYPE_GEOLOCATION).ToDoubleT(), 13);
 }