Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1542)

Unified Diff: chrome/browser/geolocation/network_location_request.cc

Issue 650144: Fix geolocation network request to not send/save cookies or send authenticati... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 10 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/geolocation/network_location_request.cc
===================================================================
--- chrome/browser/geolocation/network_location_request.cc (revision 39595)
+++ chrome/browser/geolocation/network_location_request.cc (working copy)
@@ -10,6 +10,7 @@
#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 {
@@ -92,6 +93,10 @@
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;
}
@@ -144,17 +149,7 @@
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;
@@ -282,17 +277,9 @@
<< 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";
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698