Cleanup: MockGeolocationArbitrator for GeolocationProvider tests

content/browser/geolocation/network_location_request.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 "content/browser/geolocation/network_location_request.h"
 
 #include <set>
 #include <string>
 
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/metrics/histogram.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
-#include "content/browser/geolocation/location_arbitrator.h"
+#include "content/browser/geolocation/location_arbitrator_impl.h"
 #include "content/public/common/geoposition.h"
 #include "google_apis/google_api_keys.h"
 #include "net/base/escape.h"
 #include "net/base/load_flags.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_status.h"
 
 namespace content {
 namespace {
@@ skipping 122 matching lines @@
 namespace {
 
 struct AccessPointLess {
   bool operator()(const AccessPointData* ap1,
                   const AccessPointData* ap2) const {
     return ap2->radio_signal_strength < ap1->radio_signal_strength;
   }
 };
 
 GURL FormRequestURL(const GURL& url) {
-  if (url == GeolocationArbitrator::DefaultNetworkProviderURL()) {
+  if (url == GeolocationArbitratorImpl::DefaultNetworkProviderURL()) {
     std::string api_key = google_apis::GetAPIKey();
     if (!api_key.empty()) {
       std::string query(url.query());
       if (!query.empty())
         query += "&";
       query += "key=" + net::EscapeQueryParamValue(api_key, true);
       GURL::Replacements replacements;
       replacements.SetQueryStr(query);
       return url.ReplaceComponents(replacements);
     }
@@ skipping 213 matching lines @@
 
   // Other fields are optional.
   GetAsDouble(*response_object, kAccuracyString, &position->accuracy);
 
   return true;
 }
 
 }  // namespace
 
 }  // namespace content