net: Remove typedef net::URLRequestStatus URLRequestStatus;

BUG=64263
TEST=compiled locally, trybots

Review URL: http://codereview.chromium.org/6166010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71285 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 16 insertions, 15 deletions

diff --git a/chrome/browser/geolocation/network_location_provider_unittest.cc b/chrome/browser/geolocation/network_location_provider_unittest.cc
index 9bef39c..c56c3d9 100644
--- a/chrome/browser/geolocation/network_location_provider_unittest.cc
+++ b/chrome/browser/geolocation/network_location_provider_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -433,7 +433,7 @@ TEST_F(GeolocationNetworkProviderTest, MultipleWifiScansComplete) {
       "  \"access_token\": \"" REFERENCE_ACCESS_TOKEN "\""
       "}";
   fetcher->delegate()->OnURLFetchComplete(
-      fetcher, test_server_url_, URLRequestStatus(), 200,  // OK
+      fetcher, test_server_url_, net::URLRequestStatus(), 200,  // OK
       ResponseCookies(), kNoFixNetworkResponse);
 
   // This should have set the access token anyhow
@@ -467,7 +467,7 @@ TEST_F(GeolocationNetworkProviderTest, MultipleWifiScansComplete) {
       "  }"
       "}";
   fetcher->delegate()->OnURLFetchComplete(
-      fetcher, test_server_url_, URLRequestStatus(), 200,  // OK
+      fetcher, test_server_url_, net::URLRequestStatus(), 200,  // OK
       ResponseCookies(), kReferenceNetworkResponse);
 
   provider->GetPosition(&position);
@@ -505,7 +505,7 @@ TEST_F(GeolocationNetworkProviderTest, MultipleWifiScansComplete) {
   // ...reply with a network error.
   fetcher->delegate()->OnURLFetchComplete(
       fetcher, test_server_url_,
-      URLRequestStatus(URLRequestStatus::FAILED, -1),
+      net::URLRequestStatus(net::URLRequestStatus::FAILED, -1),
       200,  // should be ignored
       ResponseCookies(), "");
 
@@ -541,7 +541,7 @@ TEST_F(GeolocationNetworkProviderTest, GatewayAndWifiScans) {
       "  \"access_token\": \"" REFERENCE_ACCESS_TOKEN "\""
       "}";
   fetcher->delegate()->OnURLFetchComplete(
-      fetcher, test_server_url_, URLRequestStatus(), 200,  // OK
+      fetcher, test_server_url_, net::URLRequestStatus(), 200,  // OK
       ResponseCookies(), kNoFixNetworkResponse);
 
   // This should have set the access token anyhow
@@ -576,7 +576,7 @@ TEST_F(GeolocationNetworkProviderTest, GatewayAndWifiScans) {
       "  }"
       "}";
   fetcher->delegate()->OnURLFetchComplete(
-      fetcher, test_server_url_, URLRequestStatus(), 200,  // OK
+      fetcher, test_server_url_, net::URLRequestStatus(), 200,  // OK
       ResponseCookies(), kReferenceNetworkResponse_1);
 
   provider->GetPosition(&position);
@@ -616,7 +616,7 @@ TEST_F(GeolocationNetworkProviderTest, GatewayAndWifiScans) {
       "  }"
       "}";
   fetcher->delegate()->OnURLFetchComplete(
-      fetcher, test_server_url_, URLRequestStatus(), 200,  // OK
+      fetcher, test_server_url_, net::URLRequestStatus(), 200,  // OK
       ResponseCookies(), kReferenceNetworkResponse_2);
 
   provider->GetPosition(&position);
@@ -649,7 +649,7 @@ TEST_F(GeolocationNetworkProviderTest, GatewayAndWifiScans) {
       "  }"
       "}";
   fetcher->delegate()->OnURLFetchComplete(
-      fetcher, test_server_url_, URLRequestStatus(), 200,  // OK
+      fetcher, test_server_url_, net::URLRequestStatus(), 200,  // OK
       ResponseCookies(), kReferenceNetworkResponse_3);
 
   provider->GetPosition(&position);
diff --git a/chrome/browser/geolocation/network_location_request.cc b/chrome/browser/geolocation/network_location_request.cc
index cc56caf..5edade1 100644
--- a/chrome/browser/geolocation/network_location_request.cc
+++ b/chrome/browser/geolocation/network_location_request.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -116,12 +116,13 @@ bool NetworkLocationRequest::MakeRequest(const std::string& host_name,
   return true;
 }
 
-void NetworkLocationRequest::OnURLFetchComplete(const URLFetcher* source,
-                                                const GURL& url,
-                                                const URLRequestStatus& status,
-                                                int response_code,
-                                                const ResponseCookies& cookies,
-                                                const std::string& data) {
+void NetworkLocationRequest::OnURLFetchComplete(
+    const URLFetcher* source,
+    const GURL& url,
+    const net::URLRequestStatus& status,
+    int response_code,
+    const ResponseCookies& cookies,
+    const std::string& data) {
   DCHECK_EQ(url_fetcher_.get(), source);
   DCHECK(url_.possibly_invalid_spec() == url.possibly_invalid_spec());