Hooks together Geolocation Feature in the Client and Engine.

device/geolocation/network_location_request.cc

Index: device/geolocation/network_location_request.cc
diff --git a/device/geolocation/network_location_request.cc b/device/geolocation/network_location_request.cc
index 49762137609a5df11c386ef7ac17b5ae70f9636a..ada8469eecf466cab2fa3846af4295f671f3f55d 100644
--- a/device/geolocation/network_location_request.cc
+++ b/device/geolocation/network_location_request.cc
@@ -18,7 +18,7 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "device/geolocation/geoposition.h"
-#include "device/geolocation/location_arbitrator_impl.h"
+#include "device/geolocation/location_arbitrator.h"
 #include "google_apis/google_api_keys.h"
 #include "net/base/escape.h"
 #include "net/base/load_flags.h"
@@ -183,7 +183,7 @@ struct AccessPointLess {
 };
 
 GURL FormRequestURL(const GURL& url) {
-  if (url == LocationArbitratorImpl::DefaultNetworkProviderURL()) {
+  if (url == LocationArbitrator::DefaultNetworkProviderURL()) {
     std::string api_key = google_apis::GetAPIKey();
     if (!api_key.empty()) {
       std::string query(url.query());