Rename various Geolocation bits for clarity and consistency.

content/browser/geolocation/network_location_provider.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_provider.h"
 
 #include "base/bind.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "content/public/browser/access_token_store.h"
@@ skipping 92 matching lines @@
 
 // NetworkLocationProvider
 NetworkLocationProvider::NetworkLocationProvider(
     AccessTokenStore* access_token_store,
     net::URLRequestContextGetter* url_context_getter,
     const GURL& url,
     const base::string16& access_token)
     : access_token_store_(access_token_store),
       wifi_data_provider_(NULL),
       wifi_data_update_callback_(
-          base::Bind(&NetworkLocationProvider::WifiDataUpdateAvailable,
+          base::Bind(&NetworkLocationProvider::OnWifiDataUpdate,
                      base::Unretained(this))),
       is_wifi_data_complete_(false),
       access_token_(access_token),
       is_permission_granted_(false),
       is_new_data_available_(false),
       weak_factory_(this) {
   // Create the position cache.
   position_cache_.reset(new PositionCache());
 
-  NetworkLocationRequest::LocationResponseCallback callback =
-      base::Bind(&NetworkLocationProvider::LocationResponseAvailable,
-                 base::Unretained(this));
-  request_.reset(new NetworkLocationRequest(url_context_getter, url, callback));
+  request_.reset(new NetworkLocationRequest(
+      url_context_getter,
+      url,
+      base::Bind(&NetworkLocationProvider::OnLocationResponse,
+                 base::Unretained(this))));
 }
 
 NetworkLocationProvider::~NetworkLocationProvider() {
   StopProvider();
 }
 
 // LocationProvider implementation
 void NetworkLocationProvider::GetPosition(Geoposition* position) {
   DCHECK(position);
   *position = position_;
 }
 
 void NetworkLocationProvider::RequestRefresh() {
   // TODO(joth): When called via the public (base class) interface, this should
   // poke each data provider to get them to expedite their next scan.
   // Whilst in the delayed start, only send request if all data is ready.
   if (!weak_factory_.HasWeakPtrs() || is_wifi_data_complete_) {
     RequestPosition();
   }
 }
 
 void NetworkLocationProvider::OnPermissionGranted() {
   const bool was_permission_granted = is_permission_granted_;
   is_permission_granted_ = true;
   if (!was_permission_granted && IsStarted()) {
     RequestRefresh();
   }
 }
 
-void NetworkLocationProvider::WifiDataUpdateAvailable(
-    WifiDataProvider* provider) {
+void NetworkLocationProvider::OnWifiDataUpdate(WifiDataProvider* provider) {
   DCHECK(provider == wifi_data_provider_);
   is_wifi_data_complete_ = wifi_data_provider_->GetData(&wifi_data_);
   OnWifiDataUpdated();
 }
 
-void NetworkLocationProvider::LocationResponseAvailable(
+void NetworkLocationProvider::OnLocationResponse(
     const Geoposition& position,
     bool server_error,
     const base::string16& access_token,
     const WifiData& wifi_data) {
   DCHECK(CalledOnValidThread());
   // Record the position and update our cache.
   position_ = position;
   if (position.Validate()) {
     position_cache_->CachePosition(wifi_data, position);
   }
@@ skipping 92 matching lines @@
   }
   request_->MakeRequest(access_token_, wifi_data_,
                         wifi_data_updated_timestamp_);
 }
 
 bool NetworkLocationProvider::IsStarted() const {
   return wifi_data_provider_ != NULL;
 }
 
 }  // namespace content