net: Remove typedef net::URLRequestStatus URLRequestStatus;

chrome/browser/extensions/extension_updater.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/extensions/extension_updater.h"
 
 #include <algorithm>
 #include <set>
 
 #include "base/logging.h"
 #include "base/file_util.h"
@@ skipping 444 matching lines @@
   prefs_ = NULL;
   timer_.Stop();
   manifest_fetcher_.reset();
   extension_fetcher_.reset();
   STLDeleteElements(&manifests_pending_);
   manifests_pending_.clear();
   extensions_pending_.clear();
 }
 
 void ExtensionUpdater::OnURLFetchComplete(
-    const URLFetcher* source, const GURL& url, const URLRequestStatus& status,
-    int response_code, const ResponseCookies& cookies,
+    const URLFetcher* source,
+    const GURL& url,
+    const net::URLRequestStatus& status,
+    int response_code,
+    const ResponseCookies& cookies,
     const std::string& data) {
   // Stop() destroys all our URLFetchers, which means we shouldn't be
   // called after Stop() is called.
   DCHECK(alive_);
 
   if (source == manifest_fetcher_.get()) {
     OnManifestFetchComplete(url, status, response_code, data);
   } else if (source == extension_fetcher_.get()) {
     OnCRXFetchComplete(url, status, response_code, data);
   } else {
@@ skipping 68 matching lines @@
  private:
   ~SafeManifestParser() {}
 
   const std::string& xml_;
   scoped_ptr<ManifestFetchData> fetch_data_;
 
   scoped_refptr<ExtensionUpdater> updater_;
 };
 
 
-void ExtensionUpdater::OnManifestFetchComplete(const GURL& url,
-                                               const URLRequestStatus& status,
-                                               int response_code,
-                                               const std::string& data) {
+void ExtensionUpdater::OnManifestFetchComplete(
+    const GURL& url,
+    const net::URLRequestStatus& status,
+    int response_code,
+    const std::string& data) {
   // We want to try parsing the manifest, and if it indicates updates are
   // available, we want to fire off requests to fetch those updates.
-  if (status.status() == URLRequestStatus::SUCCESS && response_code == 200) {
+  if ((status.status() == net::URLRequestStatus::SUCCESS) &&
+      (response_code == 200)) {
     scoped_refptr<SafeManifestParser> safe_parser(
         new SafeManifestParser(data, current_manifest_fetch_.release(), this));
     safe_parser->Start();
   } else {
     // TODO(asargent) Do exponential backoff here. (http://crbug.com/12546).
     VLOG(1) << "Failed to fetch manifest '" << url.possibly_invalid_spec()
             << "' response code:" << response_code;
   }
   manifest_fetcher_.reset();
   current_manifest_fetch_.reset();
@@ skipping 63 matching lines @@
   // Tell ExtensionService to update prefs.
   service_->UpdateExtensionBlacklist(blacklist);
 
   // Update the pref value for blacklist version
   prefs_->SetString(kExtensionBlacklistUpdateVersion,
                     current_extension_fetch_.version);
   prefs_->ScheduleSavePersistentPrefs();
 }
 
 void ExtensionUpdater::OnCRXFetchComplete(const GURL& url,
-                                          const URLRequestStatus& status,
+                                          const net::URLRequestStatus& status,
                                           int response_code,
                                           const std::string& data) {
-  if (status.status() == URLRequestStatus::SUCCESS &&
+  if (status.status() == net::URLRequestStatus::SUCCESS &&
       response_code == 200) {
     if (current_extension_fetch_.id == kBlacklistAppID) {
       ProcessBlacklist(data);
     } else {
       // Successfully fetched - now write crx to a file so we can have the
       // ExtensionService install it.
       BrowserThread::PostTask(
           BrowserThread::FILE, FROM_HERE,
           NewRunnableMethod(
               file_handler_.get(), &ExtensionUpdaterFileHandler::WriteTempFile,
@@ skipping 260 matching lines @@
         URLFetcher::Create(kExtensionFetcherId, url, URLFetcher::GET, this));
     extension_fetcher_->set_request_context(
         Profile::GetDefaultRequestContext());
     extension_fetcher_->set_load_flags(net::LOAD_DO_NOT_SEND_COOKIES |
                                        net::LOAD_DO_NOT_SAVE_COOKIES |
                                        net::LOAD_DISABLE_CACHE);
     extension_fetcher_->Start();
     current_extension_fetch_ = ExtensionFetch(id, url, hash, version);
   }
 }