Make the Geoposition helper class public

content/browser/geolocation/libgps_wrapper_linux.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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/libgps_wrapper_linux.h"
 
 #include <math.h>
 #include <dlfcn.h>
 #include <errno.h>
 
 #include "base/logging.h"
 #include "base/stringprintf.h"
-#include "content/common/geoposition.h"
+#include "content/public/common/geoposition.h"
 #include "third_party/gpsd/release-3.1/gps.h"
 
 COMPILE_ASSERT(GPSD_API_MAJOR_VERSION == 5, GPSD_API_version_is_not_5);
 
 namespace {
 const char kLibGpsName[] = "libgps.so.20";
 }  // namespace
 
 LibGps::LibGps(void* dl_handle,
                gps_open_fn gps_open,
@@ skipping 65 matching lines @@
 
   is_open_ = true;
   return true;
 }
 void LibGps::Stop() {
   if (is_open_)
     gps_close_(gps_data_.get());
   is_open_ = false;
 }
 
-bool LibGps::Read(Geoposition* position) {
+bool LibGps::Read(content::Geoposition* position) {
   DCHECK(position);
-  position->error_code = Geoposition::ERROR_CODE_POSITION_UNAVAILABLE;
+  position->error_code = content::Geoposition::ERROR_CODE_POSITION_UNAVAILABLE;
   if (!is_open_) {
       DLOG(WARNING) << "No gpsd connection";
       position->error_message = "No gpsd connection";
       return false;
   }
 
   if (gps_read_(gps_data_.get()) < 0) {
       DLOG(WARNING) << "gps_read() fails";
       position->error_message = "gps_read() fails";
       return false;
   }
 
   if (!GetPositionIfFixed(position)) {
       DLOG(WARNING) << "No fixed position";
       position->error_message = "No fixed position";
       return false;
   }
 
-  position->error_code = Geoposition::ERROR_CODE_NONE;
+  position->error_code = content::Geoposition::ERROR_CODE_NONE;
   position->timestamp = base::Time::Now();
-  if (!position->IsValidFix()) {
+  if (!position->Validate()) {
     // GetPositionIfFixed returned true, yet we've not got a valid fix.
     // This shouldn't happen; something went wrong in the conversion.
     NOTREACHED() << "Invalid position from GetPositionIfFixed: lat,long "
                  << position->latitude << "," << position->longitude
                  << " accuracy " << position->accuracy << " time "
                  << position->timestamp.ToDoubleT();
-    position->error_code = Geoposition::ERROR_CODE_POSITION_UNAVAILABLE;
+    position->error_code =
+        content::Geoposition::ERROR_CODE_POSITION_UNAVAILABLE;
     position->error_message = "Bad fix from gps";
     return false;
   }
   return true;
 }
 
-bool LibGps::GetPositionIfFixed(Geoposition* position) {
+bool LibGps::GetPositionIfFixed(content::Geoposition* position) {
   DCHECK(position);
   if (gps_data_->status == STATUS_NO_FIX) {
     DVLOG(2) << "Status_NO_FIX";
     return false;
   }
 
   if (isnan(gps_data_->fix.latitude) || isnan(gps_data_->fix.longitude)) {
     DVLOG(2) << "No valid lat/lon value";
     return false;
   }
@@ skipping 18 matching lines @@
     if (!isnan(gps_data_->fix.epv))
       position->altitude_accuracy = gps_data_->fix.epv;
   }
 
   if (!isnan(gps_data_->fix.track))
     position->heading = gps_data_->fix.track;
   if (!isnan(gps_data_->fix.speed))
     position->speed = gps_data_->fix.speed;
   return true;
 }