Create a content::UrlFetcher interface that lives in content/public/common and convert users to i...

content/browser/geolocation/network_location_provider_unittest.cc

Index: content/browser/geolocation/network_location_provider_unittest.cc
===================================================================
--- content/browser/geolocation/network_location_provider_unittest.cc	(revision 107061)
+++ content/browser/geolocation/network_location_provider_unittest.cc	(working copy)
@@ -286,9 +286,9 @@
   ASSERT_TRUE(fetcher != NULL);
 
   EXPECT_EQ(test_server_url_.spec() + kTestJson,
-            fetcher->original_url().spec());
+            fetcher->GetOriginalUrl().spec());
 
-  CheckRequestIsValid(fetcher->original_url().spec(), 0, 0, 0, "");
+  CheckRequestIsValid(fetcher->GetOriginalUrl().spec(), 0, 0, 0, "");
 }
 
 TEST_F(GeolocationNetworkProviderTest, StartProviderLongRequest) {
@@ -302,8 +302,8 @@
   // The request url should have been shortened to less than 2048 characters
   // in length by not including access points with the lowest signal strength
   // in the request.
-  EXPECT_LT(fetcher->original_url().spec().size(), size_t(2048));
-  CheckRequestIsValid(fetcher->original_url().spec(), 0, 16, 4, "");
+  EXPECT_LT(fetcher->GetOriginalUrl().spec().size(), size_t(2048));
+  CheckRequestIsValid(fetcher->GetOriginalUrl().spec(), 0, 16, 4, "");
 }
 
 TEST_F(GeolocationNetworkProviderTest, MultipleStartProvider) {
@@ -358,7 +358,7 @@
   TestURLFetcher* fetcher = get_url_fetcher_and_advance_id();
   ASSERT_TRUE(fetcher != NULL);
   EXPECT_EQ(test_server_url_.spec() + kTestJson,
-            fetcher->original_url().spec());
+            fetcher->GetOriginalUrl().spec());
 
   // Complete the network request with bad position fix.
   const char* kNoFixNetworkResponse =
@@ -382,7 +382,8 @@
   fetcher = get_url_fetcher_and_advance_id();
   ASSERT_TRUE(fetcher != NULL);
   // The request should have the wifi data.
-  CheckRequestIsValid(fetcher->original_url().spec(), 0, kFirstScanAps, 0, "");
+  CheckRequestIsValid(
+      fetcher->GetOriginalUrl().spec(), 0, kFirstScanAps, 0, "");
 
   // Send a reply with good position fix.
   const char* kReferenceNetworkResponse =
@@ -431,7 +432,7 @@
   main_message_loop_.RunAllPending();
   fetcher = get_url_fetcher_and_advance_id();
   EXPECT_TRUE(fetcher);
-  CheckRequestIsValid(fetcher->original_url().spec(), 0,
+  CheckRequestIsValid(fetcher->GetOriginalUrl().spec(), 0,
                       kThirdScanAps, 0,
                       REFERENCE_ACCESS_TOKEN);
   // ...reply with a network error.
@@ -500,7 +501,7 @@
   ASSERT_TRUE(fetcher != NULL);
 
   EXPECT_EQ(test_server_url_.spec() + kTestJson,
-            fetcher->original_url().spec());
+            fetcher->GetOriginalUrl().spec());
 }
 
 TEST_F(GeolocationNetworkProviderTest,
@@ -524,7 +525,7 @@
   fetcher = get_url_fetcher_and_advance_id();
   ASSERT_TRUE(fetcher != NULL);
 
-  CheckRequestIsValid(fetcher->original_url().spec(), 0,
+  CheckRequestIsValid(fetcher->GetOriginalUrl().spec(), 0,
                       kScanCount, 0, REFERENCE_ACCESS_TOKEN);
 }