Make the Geoposition helper class public

content/browser/geolocation/location_arbitrator.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/location_arbitrator.h"
 
 #include <map>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "content/browser/geolocation/arbitrator_dependency_factory.h"
 #include "content/public/browser/access_token_store.h"
 #include "googleurl/src/gurl.h"
 
 using content::AccessTokenStore;
+using content::Geoposition;
 
 namespace {
 
 const char* kDefaultNetworkProviderUrl = "https://maps.googleapis.com/maps/api/browserlocation/json";
 GeolocationArbitratorDependencyFactory* g_dependency_factory_for_test = NULL;
 
 }  // namespace
 
 // To avoid oscillations, set this to twice the expected update interval of a
 // a GPS-type location provider (in case it misses a beat) plus a little.
@@ skipping 91 matching lines @@
   if (is_permission_granted_)
     provider->OnPermissionGranted();
   providers_->push_back(provider);
 }
 
 void GeolocationArbitrator::LocationUpdateAvailable(
     LocationProviderBase* provider) {
   DCHECK(provider);
   Geoposition new_position;
   provider->GetPosition(&new_position);
-  DCHECK(new_position.IsInitialized());
+  DCHECK(new_position.Validate() ||
+         new_position.error_code != content::Geoposition::ERROR_CODE_NONE);
   if (!IsNewPositionBetter(position_, new_position,
                            provider == position_provider_))
     return;
   position_provider_ = provider;
   position_ = new_position;
   observer_->OnLocationUpdate(position_);
 }
 
 bool GeolocationArbitrator::IsNewPositionBetter(
     const Geoposition& old_position, const Geoposition& new_position,
     bool from_same_provider) const {
   // Updates location_info if it's better than what we currently have,
   // or if it's a newer update from the same provider.
-  if (!old_position.IsValidFix()) {
+  if (!old_position.Validate()) {
     // Older location wasn't locked.
     return true;
   }
-  if (new_position.IsValidFix()) {
+  if (new_position.Validate()) {
     // New location is locked, let's check if it's any better.
     if (old_position.accuracy >= new_position.accuracy) {
       // Accuracy is better.
       return true;
     } else if (from_same_provider) {
       // Same provider, fresher location.
       return true;
     } else if ((get_time_now_() - old_position.timestamp).InMilliseconds() >
                kFixStaleTimeoutMilliseconds) {
       // Existing fix is stale.
       return true;
     }
   }
   return false;
 }
 
 bool GeolocationArbitrator::HasPermissionBeenGranted() const {
   return is_permission_granted_;
 }
 
 void GeolocationArbitrator::SetDependencyFactoryForTest(
     GeolocationArbitratorDependencyFactory* dependency_factory) {
   g_dependency_factory_for_test = dependency_factory;
 }