net: Remove typedef net::URLRequestContext URLRequestContext;

chrome/browser/io_thread.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/io_thread.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/debug/leak_tracker.h"
 #include "base/logging.h"
@@ skipping 157 matching lines @@
                        net::NetLog::Source(),
                        net::NetLog::PHASE_NONE,
                        NULL);
   }
 
  private:
   net::NetLog* net_log_;
   DISALLOW_COPY_AND_ASSIGN(LoggingNetworkChangeObserver);
 };
 
-scoped_refptr<URLRequestContext>
+scoped_refptr<net::URLRequestContext>
 ConstructProxyScriptFetcherContext(IOThread::Globals* globals,
                                    net::NetLog* net_log) {
-  scoped_refptr<URLRequestContext> context(new URLRequestContext);
+  scoped_refptr<net::URLRequestContext> context(new net::URLRequestContext);
   context->set_net_log(net_log);
   context->set_host_resolver(globals->host_resolver.get());
   context->set_cert_verifier(globals->cert_verifier.get());
   context->set_dnsrr_resolver(globals->dnsrr_resolver.get());
   context->set_http_auth_handler_factory(
       globals->http_auth_handler_factory.get());
   context->set_proxy_service(globals->proxy_script_fetcher_proxy_service.get());
   context->set_http_transaction_factory(
       globals->proxy_script_fetcher_http_transaction_factory.get());
   // In-memory cookie store.
@@ skipping 147 matching lines @@
           globals_->dnsrr_resolver.get(),
           NULL /* dns_cert_checker */,
           NULL /* ssl_host_info_factory */,
           globals_->proxy_script_fetcher_proxy_service.get(),
           globals_->ssl_config_service.get(),
           new net::SpdySessionPool(globals_->ssl_config_service.get()),
           globals_->http_auth_handler_factory.get(),
           &globals_->network_delegate,
           net_log_));
 
-  scoped_refptr<URLRequestContext> proxy_script_fetcher_context =
+  scoped_refptr<net::URLRequestContext> proxy_script_fetcher_context =
       ConstructProxyScriptFetcherContext(globals_, net_log_);
   globals_->proxy_script_fetcher_context = proxy_script_fetcher_context;
 }
 
 void IOThread::CleanUp() {
   // Step 1: Kill all things that might be holding onto
-  // net::URLRequest/URLRequestContexts.
+  // net::URLRequest/net::URLRequestContexts.
 
 #if defined(USE_NSS)
   net::ShutdownOCSP();
 #endif  // defined(USE_NSS)
 
   // Destroy all URLRequests started by URLFetchers.
   URLFetcher::CancelAll();
 
   // If any child processes are still running, terminate them and
   // and delete the BrowserChildProcessHost instances to release whatever
   // IO thread only resources they are referencing.
   BrowserChildProcessHost::TerminateAll();
 
   std::list<ChromeURLRequestContextGetter*> url_request_context_getters;
   url_request_context_getters.swap(url_request_context_getters_);
   for (std::list<ChromeURLRequestContextGetter*>::iterator it =
        url_request_context_getters.begin();
        it != url_request_context_getters.end(); ++it) {
     ChromeURLRequestContextGetter* getter = *it;
     // Stop all pending certificate provenance check uploads
     net::DnsCertProvenanceChecker* checker =
         getter->GetURLRequestContext()->dns_cert_checker();
     if (checker)
       checker->Shutdown();
     getter->ReleaseURLRequestContext();
   }
 
-  // Step 2: Release objects that the URLRequestContext could have been pointing
-  // to.
+  // Step 2: Release objects that the net::URLRequestContext could have been
+  // pointing to.
 
   // This must be reset before the ChromeNetLog is destroyed.
   network_change_observer_.reset();
 
   // Not initialized in Init().  May not be initialized.
   if (predictor_) {
     predictor_->Shutdown();
 
     // TODO(willchan): Stop reference counting Predictor.  It's owned by
     // IOThread now.
@@ skipping 109 matching lines @@
     net::HostCache* host_cache =
         globals_->host_resolver.get()->GetAsHostResolverImpl()->cache();
     if (host_cache)
       host_cache->clear();
   }
   // Clear all of the passively logged data.
   // TODO(eroman): this is a bit heavy handed, really all we need to do is
   //               clear the data pertaining to off the record context.
   net_log_->ClearAllPassivelyCapturedEvents();
 }