Rename various Geolocation bits for clarity and consistency.

content/browser/geolocation/location_arbitrator_impl.h

 // 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.
 
 #ifndef CONTENT_BROWSER_GEOLOCATION_LOCATION_ARBITRATOR_IMPL_H_
 #define CONTENT_BROWSER_GEOLOCATION_LOCATION_ARBITRATOR_IMPL_H_
 
 #include "base/callback_forward.h"
 #include "base/memory/scoped_vector.h"
 #include "base/strings/string16.h"
@@ skipping 52 matching lines @@
 
  private:
   // Takes ownership of |provider| on entry; it will either be added to
   // |providers_| or deleted on error (e.g. it fails to start).
   void RegisterProvider(LocationProvider* provider);
   void OnAccessTokenStoresLoaded(
       AccessTokenStore::AccessTokenSet access_token_store,
       net::URLRequestContextGetter* context_getter);
   void DoStartProviders();
 
-  // The providers call this function when a new position is available.
-  void LocationUpdateAvailable(const LocationProvider* provider,
-                               const Geoposition& new_position);
+  // Gets called when a provider has a new position.
+  void OnLocationUpdate(const LocationProvider* provider,
+                        const Geoposition& new_position);
 
   // Returns true if |new_position| is an improvement over |old_position|.
   // Set |from_same_provider| to true if both the positions came from the same
   // provider.
   bool IsNewPositionBetter(const Geoposition& old_position,
                            const Geoposition& new_position,
                            bool from_same_provider) const;
 
   scoped_refptr<AccessTokenStore> access_token_store_;
-  LocationUpdateCallback callback_;
-  LocationProvider::LocationProviderUpdateCallback provider_callback_;
+  LocationUpdateCallback arbitrator_update_callback_;
+  LocationProvider::LocationProviderUpdateCallback provider_update_callback_;
   ScopedVector<LocationProvider> providers_;
   bool use_high_accuracy_;
   // The provider which supplied the current |position_|
   const LocationProvider* position_provider_;
   bool is_permission_granted_;
   // The current best estimate of our position.
   Geoposition position_;
 
   // Tracks whether providers should be running.
   bool is_running_;
 
   DISALLOW_COPY_AND_ASSIGN(LocationArbitratorImpl);
 };
 
 // Factory functions for the various types of location provider to abstract
 // over the platform-dependent implementations.
 LocationProvider* NewSystemLocationProvider();
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_GEOLOCATION_LOCATION_ARBITRATOR_IMPL_H_