Make the Geoposition helper class public

content/browser/geolocation/network_location_request.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_request.h"
 
 #include <set>
 #include <string>
 
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
-#include "content/common/geoposition.h"
 #include "content/common/net/url_fetcher_impl.h"
+#include "content/public/common/geoposition.h"
 #include "net/base/escape.h"
 #include "net/base/load_flags.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_status.h"
 
 namespace {
 
 const size_t kMaxRequestLength = 2048;
 
 const char kAccessTokenString[] = "access_token";
@@ skipping 10 matching lines @@
                     const string16& access_token,
                     const WifiData& wifi_data,
                     const base::Time& timestamp);
 
 // Parsers the server response.
 void GetLocationFromResponse(bool http_post_result,
                              int status_code,
                              const std::string& response_body,
                              const base::Time& timestamp,
                              const GURL& server_url,
-                             Geoposition* position,
+                             content::Geoposition* position,
                              string16* access_token);
 
 // Parses the server response body. Returns true if parsing was successful.
 // Sets |*position| to the parsed location if a valid fix was received,
-// otherwise leaves it unchanged (i.e. IsInitialized() == false).
+// otherwise leaves it unchanged.
 bool ParseServerResponse(const std::string& response_body,
                          const base::Time& timestamp,
-                         Geoposition* position,
+                         content::Geoposition* position,
                          string16* access_token);
 void AddWifiData(const WifiData& wifi_data,
                  int age_milliseconds,
                  std::vector<std::string>* params);
 }  // namespace
 
 int NetworkLocationRequest::url_fetcher_id_for_tests = 0;
 
 NetworkLocationRequest::NetworkLocationRequest(
     net::URLRequestContextGetter* context,
@@ skipping 33 matching lines @@
   return true;
 }
 
 void NetworkLocationRequest::OnURLFetchComplete(
     const content::URLFetcher* source) {
   DCHECK_EQ(url_fetcher_.get(), source);
 
   net::URLRequestStatus status = source->GetStatus();
   int response_code = source->GetResponseCode();
 
-  Geoposition position;
+  content::Geoposition position;
   string16 access_token;
   std::string data;
   source->GetResponseAsString(&data);
   GetLocationFromResponse(status.is_success(),
                           response_code,
                           data,
                           timestamp_,
                           source->GetURL(),
                           &position,
                           &access_token);
@@ skipping 110 matching lines @@
     // interpreted as the wifi parameter separator.
     ReplaceSubstringsAfterOffset(&ssid, 0, "|", "\\|");
     AddString("ssid:", ssid, &wifi_params);
     params->push_back(
         "wifi=" + net::EscapeQueryParamValue(wifi_params, false));
   }
 }
 
 void FormatPositionError(const GURL& server_url,
                          const std::string& message,
-                         Geoposition* position) {
-    position->error_code = Geoposition::ERROR_CODE_POSITION_UNAVAILABLE;
+                         content::Geoposition* position) {
+    position->error_code =
+        content::Geoposition::ERROR_CODE_POSITION_UNAVAILABLE;
     position->error_message = "Network location provider at '";
     position->error_message += server_url.possibly_invalid_spec();
     position->error_message += "' : ";
     position->error_message += message;
     position->error_message += ".";
     VLOG(1) << "NetworkLocationRequest::GetLocationFromResponse() : "
             << position->error_message;
 }
 
 void GetLocationFromResponse(bool http_post_result,
                              int status_code,
                              const std::string& response_body,
                              const base::Time& timestamp,
                              const GURL& server_url,
-                             Geoposition* position,
+                             content::Geoposition* position,
                              string16* access_token) {
   DCHECK(position);
   DCHECK(access_token);
 
   // HttpPost can fail for a number of reasons. Most likely this is because
   // we're offline, or there was no response.
   if (!http_post_result) {
     FormatPositionError(server_url, "No response received", position);
     return;
   }
   if (status_code != 200) {  // HTTP OK.
     std::string message = "Returned error code ";
     message += base::IntToString(status_code);
     FormatPositionError(server_url, message, position);
     return;
   }
   // We use the timestamp from the device data that was used to generate
   // this position fix.
   if (!ParseServerResponse(response_body, timestamp, position, access_token)) {
     // We failed to parse the repsonse.
     FormatPositionError(server_url, "Response was malformed", position);
     return;
   }
   // The response was successfully parsed, but it may not be a valid
   // position fix.
-  if (!position->IsValidFix()) {
+  if (!position->Validate()) {
     FormatPositionError(server_url,
                         "Did not provide a good position fix", position);
     return;
   }
 }
 
 // Numeric values without a decimal point have type integer and IsDouble() will
 // return false. This is convenience function for detecting integer or floating
 // point numeric values. Note that isIntegral() includes boolean values, which
 // is not what we want.
 bool GetAsDouble(const DictionaryValue& object,
                  const std::string& property_name,
                  double* out) {
   DCHECK(out);
   Value* value = NULL;
   if (!object.Get(property_name, &value))
     return false;
   int value_as_int;
   DCHECK(value);
   if (value->GetAsInteger(&value_as_int)) {
     *out = value_as_int;
     return true;
   }
   return value->GetAsDouble(out);
 }
 
 bool ParseServerResponse(const std::string& response_body,
                          const base::Time& timestamp,
-                         Geoposition* position,
+                         content::Geoposition* position,
                          string16* access_token) {
   DCHECK(position);
-  DCHECK(!position->IsInitialized());
+  DCHECK(!position->Validate());
+  DCHECK(position->error_code == content::Geoposition::ERROR_CODE_NONE);
   DCHECK(access_token);
   DCHECK(!timestamp.is_null());
 
   if (response_body.empty()) {
     LOG(WARNING) << "ParseServerResponse() : Response was empty.";
     return false;
   }
   DVLOG(1) << "ParseServerResponse() : Parsing response " << response_body;
 
   // Parse the response, ignoring comments.
@@ skipping 81 matching lines @@
   position->longitude = longitude;
   position->timestamp = timestamp;
 
   // Other fields are optional.
   GetAsDouble(*response_object, kAccuracyString, &position->accuracy);
 
   return true;
 }
 
 }  // namespace