net: Remove typedef net::URLRequestStatus URLRequestStatus;

chrome/browser/geolocation/network_location_provider_unittest.cc

-// 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.
 
 #include "chrome/browser/geolocation/network_location_provider.h"
 
 #include "base/json/json_reader.h"
 #include "base/scoped_ptr.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/geolocation/fake_access_token_store.h"
@@ skipping 414 matching lines @@
   TestURLFetcher* fetcher = get_url_fetcher_and_advance_id();
   ASSERT_TRUE(fetcher != NULL);
   CheckEmptyRequestIsValid(fetcher->upload_data());
   // Complete the network request with bad position fix.
   const char* kNoFixNetworkResponse =
       "{"
       "  \"location\": null,"
       "  \"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
   EXPECT_EQ(UTF8ToUTF16(REFERENCE_ACCESS_TOKEN),
             access_token_store_->access_token_set_[test_server_url_]);
 
   Geoposition position;
   provider->GetPosition(&position);
   EXPECT_FALSE(position.IsValidFix());
 
@@ skipping 13 matching lines @@
       "{"
       "  \"location\": {"
       "    \"latitude\": 51.0,"
       "    \"longitude\": -0.1,"
       "    \"altitude\": 30.1,"
       "    \"accuracy\": 1200.4,"
       "    \"altitude_accuracy\": 10.6"
       "  }"
       "}";
   fetcher->delegate()->OnURLFetchComplete(
-      fetcher, test_server_url_, URLRequestStatus(), 200,  // OK
+      fetcher, test_server_url_, net::URLRequestStatus(), 200,  // OK
       ResponseCookies(), kReferenceNetworkResponse);
 
   provider->GetPosition(&position);
   EXPECT_EQ(51.0, position.latitude);
   EXPECT_EQ(-0.1, position.longitude);
   EXPECT_EQ(30.1, position.altitude);
   EXPECT_EQ(1200.4, position.accuracy);
   EXPECT_EQ(10.6, position.altitude_accuracy);
   EXPECT_TRUE(position.is_valid_timestamp());
   EXPECT_TRUE(position.IsValidFix());
@@ skipping 17 matching lines @@
 
   // Now a third scan with more than twice the original amount -> new request.
   const int kThirdScanAps = kFirstScanAps * 2 + 1;
   wifi_data_provider_->SetData(CreateReferenceWifiScanData(kThirdScanAps));
   main_message_loop_.RunAllPending();
   fetcher = get_url_fetcher_and_advance_id();
   EXPECT_TRUE(fetcher);
   // ...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(), "");
 
   // Error means we now no longer have a fix.
   provider->GetPosition(&position);
   EXPECT_FALSE(position.is_valid_latlong());
   EXPECT_FALSE(position.IsValidFix());
 
   // Wifi scan returns to original set: should be serviced from cache.
   wifi_data_provider_->SetData(CreateReferenceWifiScanData(kFirstScanAps));
@@ skipping 15 matching lines @@
   CheckEmptyRequestIsValid(fetcher->upload_data());
   // Complete the network request with bad position fix (using #define so we
   // can paste this into various other strings below)
   #define REFERENCE_ACCESS_TOKEN "2:k7j3G6LaL6u_lafw:4iXOeOpTh1glSXe"
   const char* kNoFixNetworkResponse =
       "{"
       "  \"location\": null,"
       "  \"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
   EXPECT_EQ(UTF8ToUTF16(REFERENCE_ACCESS_TOKEN),
             access_token_store_->access_token_set_[test_server_url_]);
 
   Geoposition position;
   provider->GetPosition(&position);
   EXPECT_FALSE(position.IsValidFix());
 
@@ skipping 14 matching lines @@
       "{"
       "  \"location\": {"
       "    \"latitude\": 51.0,"
       "    \"longitude\": -0.1,"
       "    \"altitude\": 30.1,"
       "    \"accuracy\": 1200.4,"
       "    \"altitude_accuracy\": 10.6"
       "  }"
       "}";
   fetcher->delegate()->OnURLFetchComplete(
-      fetcher, test_server_url_, URLRequestStatus(), 200,  // OK
+      fetcher, test_server_url_, net::URLRequestStatus(), 200,  // OK
       ResponseCookies(), kReferenceNetworkResponse_1);
 
   provider->GetPosition(&position);
   EXPECT_EQ(51.0, position.latitude);
   EXPECT_EQ(-0.1, position.longitude);
   EXPECT_EQ(30.1, position.altitude);
   EXPECT_EQ(1200.4, position.accuracy);
   EXPECT_EQ(10.6, position.altitude_accuracy);
   EXPECT_TRUE(position.is_valid_timestamp());
   EXPECT_TRUE(position.IsValidFix());
@@ skipping 19 matching lines @@
       "{"
       "  \"location\": {"
       "    \"latitude\": 51.1,"
       "    \"longitude\": -0.1,"
       "    \"altitude\": 30.2,"
       "    \"accuracy\": 1100.4,"
       "    \"altitude_accuracy\": 10.6"
       "  }"
       "}";
   fetcher->delegate()->OnURLFetchComplete(
-      fetcher, test_server_url_, URLRequestStatus(), 200,  // OK
+      fetcher, test_server_url_, net::URLRequestStatus(), 200,  // OK
       ResponseCookies(), kReferenceNetworkResponse_2);
 
   provider->GetPosition(&position);
   EXPECT_EQ(51.1, position.latitude);
   EXPECT_EQ(-0.1, position.longitude);
   EXPECT_EQ(30.2, position.altitude);
   EXPECT_EQ(1100.4, position.accuracy);
   EXPECT_EQ(10.6, position.altitude_accuracy);
   EXPECT_TRUE(position.is_valid_timestamp());
   EXPECT_TRUE(position.IsValidFix());
@@ skipping 12 matching lines @@
       "{"
       "  \"location\": {"
       "    \"latitude\": 51.3,"
       "    \"longitude\": -0.1,"
       "    \"altitude\": 30.2,"
       "    \"accuracy\": 50.4,"
       "    \"altitude_accuracy\": 10.6"
       "  }"
       "}";
   fetcher->delegate()->OnURLFetchComplete(
-      fetcher, test_server_url_, URLRequestStatus(), 200,  // OK
+      fetcher, test_server_url_, net::URLRequestStatus(), 200,  // OK
       ResponseCookies(), kReferenceNetworkResponse_3);
 
   provider->GetPosition(&position);
   EXPECT_EQ(51.3, position.latitude);
   EXPECT_EQ(-0.1, position.longitude);
   EXPECT_EQ(30.2, position.altitude);
   EXPECT_EQ(50.4, position.accuracy);
   EXPECT_EQ(10.6, position.altitude_accuracy);
   EXPECT_TRUE(position.is_valid_timestamp());
   EXPECT_TRUE(position.IsValidFix());
@@ skipping 109 matching lines @@
     } else {
       const int evicted = i - kCacheSize;
       EXPECT_FALSE(cache.FindPosition(CreateReferenceRouterData(2),
                                       CreateReferenceWifiScanData(evicted)));
       EXPECT_TRUE(cache.FindPosition(CreateReferenceRouterData(2),
                                      CreateReferenceWifiScanData(evicted + 1)));
     }
   }
 }