| Index: content/browser/geolocation/network_location_request.cc
|
| ===================================================================
|
| --- content/browser/geolocation/network_location_request.cc (revision 107061)
|
| +++ content/browser/geolocation/network_location_request.cc (working copy)
|
| @@ -89,8 +89,8 @@
|
| wifi_data, timestamp_);
|
| url_fetcher_.reset(URLFetcher::Create(
|
| url_fetcher_id_for_tests, request_url, URLFetcher::GET, this));
|
| - url_fetcher_->set_request_context(url_context_);
|
| - url_fetcher_->set_load_flags(
|
| + url_fetcher_->SetRequestContext(url_context_);
|
| + url_fetcher_->SetLoadFlags(
|
| 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);
|
| @@ -99,11 +99,12 @@
|
| return true;
|
| }
|
|
|
| -void NetworkLocationRequest::OnURLFetchComplete(const URLFetcher* source) {
|
| +void NetworkLocationRequest::OnURLFetchComplete(
|
| + const content::URLFetcher* source) {
|
| DCHECK_EQ(url_fetcher_.get(), source);
|
|
|
| - net::URLRequestStatus status = source->status();
|
| - int response_code = source->response_code();
|
| + net::URLRequestStatus status = source->GetStatus();
|
| + int response_code = source->GetResponseCode();
|
|
|
| Geoposition position;
|
| string16 access_token;
|
| @@ -113,7 +114,7 @@
|
| response_code,
|
| data,
|
| timestamp_,
|
| - source->url(),
|
| + source->GetUrl(),
|
| &position,
|
| &access_token);
|
| const bool server_error =
|
|
|