Fix geolocation network request to not send/save cookies or send authenticati...

chrome/browser/geolocation/network_location_request.cc

 // Copyright (c) 2010 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 "chrome/browser/geolocation/network_location_request.h"
 
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/net/url_request_context_getter.h"
 #include "chrome/common/geoposition.h"
+#include "net/base/load_flags.h"
 #include "net/url_request/url_request_status.h"
 
 namespace {
 const char* const kMimeApplicationJson = "application/json";
 
 // See http://code.google.com/apis/gears/geolocation_network_protocol.html
 const char* kGeoLocationNetworkProtocolVersion = "1.1.0";
 
 const wchar_t* kAccessTokenString = L"access_token";
 const wchar_t* kLocationString = L"location";
@@ skipping 62 matching lines @@
                        &post_body)) {
     return false;
   }
   timestamp_ = timestamp;
 
   url_fetcher_.reset(URLFetcher::Create(
       wifi_data.access_point_data.size(),  // Used for testing
       url_, URLFetcher::POST, this));
   url_fetcher_->set_upload_data(kMimeApplicationJson, post_body);
   url_fetcher_->set_request_context(url_context_);
+  url_fetcher_->set_load_flags(
+      net::LOAD_BYPASS_CACHE | net::LOAD_DISABLE_CACHE |
+      net::LOAD_DO_NOT_SAVE_COOKIES | net::LOAD_DO_NOT_SEND_COOKIES |
+      net::LOAD_DO_NOT_SEND_AUTH_DATA);
   url_fetcher_->Start();
   return true;
 }
 
 void NetworkLocationRequest::OnURLFetchComplete(const URLFetcher* source,
                                                 const GURL& url,
                                                 const URLRequestStatus& status,
                                                 int response_code,
                                                 const ResponseCookies& cookies,
                                                 const std::string& data) {
@@ skipping 32 matching lines @@
   body_object.SetString(L"version", kGeoLocationNetworkProtocolVersion);
   AddString(L"host", host_name, &body_object);
 
   AddString(L"access_token", access_token, &body_object);
 
   body_object.SetBoolean(L"request_address", false);
 
   AddRadioData(radio_data, &body_object);
   AddWifiData(wifi_data, &body_object);
 
-  // TODO(joth): Do we need to mess with locales?
-  // We always use the platform independent 'C' locale when writing the JSON
-  // request, irrespective of the browser's locale. This avoids the need for
-  // the network location provider to determine the locale of the request and
-  // parse the JSON accordingly.
-//  char* current_locale = setlocale(LC_NUMERIC, "C");
-
   base::JSONWriter::Write(&body_object, false, data);
-
-//  setlocale(LC_NUMERIC, current_locale);
-
   DLOG(INFO) << "NetworkLocationRequest::FormRequestBody(): Formed body "
              << data << ".\n";
   return true;
 }
 
 void FormatPositionError(const GURL& server_url,
                          const std::wstring& message,
                          Geoposition* position) {
     position->error_code = Geoposition::ERROR_CODE_POSITION_UNAVAILABLE;
     position->error_message = L"Network location provider at '";
@@ skipping 107 matching lines @@
   DCHECK(timestamp != kint64min);
 
   if (response_body.empty()) {
     LOG(WARNING) << "ParseServerResponse() : Response was empty.\n";
     return false;
   }
   DLOG(INFO) << "ParseServerResponse() : Parsing response "
              << response_body << ".\n";
 
   // Parse the response, ignoring comments.
-  // TODO(joth): Gears version stated: The JSON reponse from the network
-  // location provider should always use the 'C' locale.
-  // Chromium JSON parser works in UTF8 so hopefully we can ignore setlocale?
-
-//  char* current_locale = setlocale(LC_NUMERIC, "C");
   std::string error_msg;
   scoped_ptr<Value> response_value(base::JSONReader::ReadAndReturnError(
       response_body, false, &error_msg));
-
-//  setlocale(LC_NUMERIC, current_locale);
-
   if (response_value == NULL) {
     LOG(WARNING) << "ParseServerResponse() : JSONReader failed : "
                  << error_msg << ".\n";
     return false;
   }
 
   if (!response_value->IsType(Value::TYPE_DICTIONARY)) {
     LOG(INFO) << "ParseServerResponse() : Unexpected resopnse type "
               << response_value->GetType() <<  ".\n";
     return false;
@@ skipping 99 matching lines @@
     AddInteger(L"signal_strength", iter->radio_signal_strength, wifi_tower);
     AddInteger(L"age", iter->age, wifi_tower);
     AddInteger(L"channel", iter->channel, wifi_tower);
     AddInteger(L"signal_to_noise", iter->signal_to_noise, wifi_tower);
     AddString(L"ssid", iter->ssid, wifi_tower);
     wifi_towers->Append(wifi_tower);
   }
   body_object->Set(L"wifi_towers", wifi_towers);
 }
 }  // namespace