net: Remove typedef net::URLRequestStatus URLRequestStatus;

chrome/browser/safe_browsing/safe_browsing_test.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.
 //
 // This test uses the safebrowsing test server published at
 // http://code.google.com/p/google-safe-browsing/ to test the safebrowsing
 // protocol implemetation. Details of the safebrowsing testing flow is
 // documented at
 // http://code.google.com/p/google-safe-browsing/wiki/ProtocolTesting
 //
 // This test launches safebrowsing test server and issues several update
@@ skipping 322 matching lines @@
 // A ref counted helper class that handles callbacks between IO thread and UI
 // thread.
 class SafeBrowsingServiceTestHelper
     : public base::RefCountedThreadSafe<SafeBrowsingServiceTestHelper>,
       public SafeBrowsingService::Client,
       public URLFetcher::Delegate {
  public:
   explicit SafeBrowsingServiceTestHelper(
       SafeBrowsingServiceTest* safe_browsing_test)
       : safe_browsing_test_(safe_browsing_test),
-        response_status_(URLRequestStatus::FAILED) {
+        response_status_(net::URLRequestStatus::FAILED) {
   }
 
   // Callbacks for SafeBrowsingService::Client.
   virtual void OnBrowseUrlCheckResult(
       const GURL& url, SafeBrowsingService::UrlCheckResult result) {
     EXPECT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::IO));
     EXPECT_TRUE(safe_browsing_test_->is_checked_url_in_db());
     safe_browsing_test_->set_is_checked_url_safe(
         result == SafeBrowsingService::URL_SAFE);
     BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
@@ skipping 79 matching lines @@
         BrowserThread::IO,
         FROM_HERE,
         NewRunnableMethod(this,
             &SafeBrowsingServiceTestHelper::CheckStatusOnIOThread),
         wait_time_msec);
     // Will continue after OnWaitForStatusUpdateDone().
     ui_test_utils::RunMessageLoop();
   }
 
   void WaitTillServerReady(const char* host, int port) {
-    response_status_ = URLRequestStatus::FAILED;
+    response_status_ = net::URLRequestStatus::FAILED;
     GURL url(StringPrintf("http://%s:%d%s?test_step=0",
                           host, port, kDBResetPath));
     // TODO(lzheng): We should have a way to reliably tell when a server is
     // ready so we could get rid of the Sleep and retry loop.
     while (true) {
-      if (FetchUrl(url) == URLRequestStatus::SUCCESS)
+      if (FetchUrl(url) == net::URLRequestStatus::SUCCESS)
         break;
       // Wait and try again if last fetch was failed. The loop will hit the
       // timeout in OutOfProcTestRunner if the fetch can not get success
       // response.
       base::PlatformThread::Sleep(TestTimeouts::action_timeout_ms());
     }
   }
 
   // Calls test server to fetch database for verification.
-  URLRequestStatus::Status FetchDBToVerify(const char* host, int port,
-                                           int test_step) {
+  net::URLRequestStatus::Status FetchDBToVerify(const char* host, int port,
+                                                int test_step) {
     // TODO(lzheng): Remove chunk_type=add once it is not needed by the server.
     GURL url(StringPrintf("http://%s:%d%s?"
                           "client=chromium&appver=1.0&pver=2.2&test_step=%d&"
                           "chunk_type=add",
                           host, port, kDBVerifyPath, test_step));
     return FetchUrl(url);
   }
 
   // Calls test server to fetch URLs for verification.
-  URLRequestStatus::Status FetchUrlsToVerify(const char* host, int port,
-                                             int test_step) {
+  net::URLRequestStatus::Status FetchUrlsToVerify(const char* host, int port,
+                                                  int test_step) {
     GURL url(StringPrintf("http://%s:%d%s?"
                           "client=chromium&appver=1.0&pver=2.2&test_step=%d",
                           host, port, kUrlVerifyPath, test_step));
     return FetchUrl(url);
   }
 
   // Calls test server to check if test data is done. E.g.: if there is a
   // bad URL that server expects test to fetch full hash but the test didn't,
   // this verification will fail.
-  URLRequestStatus::Status VerifyTestComplete(const char* host, int port,
-                                              int test_step) {
+  net::URLRequestStatus::Status VerifyTestComplete(const char* host, int port,
+                                                   int test_step) {
     GURL url(StringPrintf("http://%s:%d%s?test_step=%d",
                           host, port, kTestCompletePath, test_step));
     return FetchUrl(url);
   }
 
   // Callback for URLFetcher.
   virtual void OnURLFetchComplete(const URLFetcher* source,
                                   const GURL& url,
-                                  const URLRequestStatus& status,
+                                  const net::URLRequestStatus& status,
                                   int response_code,
                                   const ResponseCookies& cookies,
                                   const std::string& data) {
     response_data_ = data;
     response_status_ = status.status();
     StopUILoop();
   }
 
   const std::string& response_data() {
     return response_data_;
   }
 
  private:
   // Stops UI loop after desired status is updated.
   void StopUILoop() {
     EXPECT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::UI));
     MessageLoopForUI::current()->Quit();
   }
 
   // Fetch a URL. If message_loop_started is true, starts the message loop
   // so the caller could wait till OnURLFetchComplete is called.
-  URLRequestStatus::Status FetchUrl(const GURL& url) {
+  net::URLRequestStatus::Status FetchUrl(const GURL& url) {
     url_fetcher_.reset(new URLFetcher(url, URLFetcher::GET, this));
     url_fetcher_->set_load_flags(net::LOAD_DISABLE_CACHE);
     url_fetcher_->set_request_context(Profile::GetDefaultRequestContext());
     url_fetcher_->Start();
     ui_test_utils::RunMessageLoop();
     return response_status_;
   }
 
   base::OneShotTimer<SafeBrowsingServiceTestHelper> check_update_timer_;
   SafeBrowsingServiceTest* safe_browsing_test_;
   scoped_ptr<URLFetcher> url_fetcher_;
   std::string response_data_;
-  URLRequestStatus::Status response_status_;
+  net::URLRequestStatus::Status response_status_;
   DISALLOW_COPY_AND_ASSIGN(SafeBrowsingServiceTestHelper);
 };
 
 IN_PROC_BROWSER_TEST_F(SafeBrowsingServiceTest, SafeBrowsingSystemTest) {
   LOG(INFO) << "Start test";
   const char* server_host = SafeBrowsingTestServer::Host();
   int server_port = SafeBrowsingTestServer::Port();
   ASSERT_TRUE(InitSafeBrowsingService());
 
   scoped_refptr<SafeBrowsingServiceTestHelper> safe_browsing_helper(
@@ skipping 39 matching lines @@
     } while (is_update_scheduled() || is_initial_request() ||
              !is_database_ready());
 
 
     if (last_update() < now) {
       // This means no data available anymore.
       break;
     }
 
     // Fetches URLs to verify and waits till server responses with data.
-    EXPECT_EQ(URLRequestStatus::SUCCESS,
+    EXPECT_EQ(net::URLRequestStatus::SUCCESS,
               safe_browsing_helper->FetchUrlsToVerify(server_host,
                                                       server_port,
                                                       step));
 
     std::vector<PhishingUrl> phishing_urls;
     EXPECT_TRUE(ParsePhishingUrls(safe_browsing_helper->response_data(),
                                   &phishing_urls));
     EXPECT_GT(phishing_urls.size(), 0U);
     for (size_t j = 0; j < phishing_urls.size(); ++j) {
       // Verifes with server if a URL is a phishing URL and waits till server
@@ skipping 10 matching lines @@
             << " test step: " << step;
       } else {
         EXPECT_TRUE(is_checked_url_safe())
             << phishing_urls[j].url
             << " is_phishing: " << phishing_urls[j].is_phishing
             << " test step: " << step;
       }
     }
     // TODO(lzheng): We should verify the fetched database with local
     // database to make sure they match.
-    EXPECT_EQ(URLRequestStatus::SUCCESS,
+    EXPECT_EQ(net::URLRequestStatus::SUCCESS,
               safe_browsing_helper->FetchDBToVerify(server_host,
                                                     server_port,
                                                     step));
     EXPECT_GT(safe_browsing_helper->response_data().size(), 0U);
     last_step = step;
   }
 
   // Verifies with server if test is done and waits till server responses.
-  EXPECT_EQ(URLRequestStatus::SUCCESS,
+  EXPECT_EQ(net::URLRequestStatus::SUCCESS,
             safe_browsing_helper->VerifyTestComplete(server_host,
                                                      server_port,
                                                      last_step));
   EXPECT_EQ("yes", safe_browsing_helper->response_data());
   test_server.Stop();
 }