net: Remove typedef net::URLRequest URLRequest;

chrome/browser/ssl/ssl_error_handler.cc

 // Copyright (c) 2010 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/ssl/ssl_error_handler.h"
 
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/renderer_host/resource_dispatcher_host.h"
 #include "chrome/browser/renderer_host/resource_dispatcher_host_request_info.h"
 #include "chrome/browser/ssl/ssl_cert_error_handler.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "net/base/net_errors.h"
 #include "net/url_request/url_request.h"
 
 SSLErrorHandler::SSLErrorHandler(ResourceDispatcherHost* rdh,
-                                 URLRequest* request,
+                                 net::URLRequest* request,
                                  ResourceType::Type resource_type,
                                  const std::string& frame_origin,
                                  const std::string& main_frame_origin)
     : manager_(NULL),
       request_id_(0, 0),
       resource_dispatcher_host_(rdh),
       request_url_(request->url()),
       resource_type_(resource_type),
       frame_origin_(frame_origin),
       main_frame_origin_(main_frame_origin),
       request_has_been_notified_(false) {
   DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   ResourceDispatcherHostRequestInfo* info =
       ResourceDispatcherHost::InfoForRequest(request);
   request_id_.child_id = info->child_id();
   request_id_.request_id = info->request_id();
 
   if (!ResourceDispatcherHost::RenderViewForRequest(request,
                                                     &render_process_host_id_,
                                                     &tab_contents_id_))
     NOTREACHED();
 
   // This makes sure we don't disappear on the IO thread until we've given an
-  // answer to the URLRequest.
+  // answer to the net::URLRequest.
   //
   // Release in CompleteCancelRequest, CompleteContinueRequest, or
   // CompleteTakeNoAction.
   AddRef();
 }
 
 SSLErrorHandler::~SSLErrorHandler() {}
 
 void SSLErrorHandler::OnDispatchFailed() {
   TakeNoAction();
@@ skipping 59 matching lines @@
 
   // We need to complete this task on the IO thread.
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       NewRunnableMethod(this, &SSLErrorHandler::CompleteTakeNoAction));
 }
 
 void SSLErrorHandler::CompleteCancelRequest(int error) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
-  // It is important that we notify the URLRequest only once.  If we try to
-  // notify the request twice, it may no longer exist and |this| might have
+  // It is important that we notify the net::URLRequest only once.  If we try
+  // to notify the request twice, it may no longer exist and |this| might have
   // already have been deleted.
   DCHECK(!request_has_been_notified_);
   if (request_has_been_notified_)
     return;
 
-  URLRequest* request = resource_dispatcher_host_->GetURLRequest(request_id_);
+  net::URLRequest* request =
+      resource_dispatcher_host_->GetURLRequest(request_id_);
   if (request) {
     // The request can be NULL if it was cancelled by the renderer (as the
     // result of the user navigating to a new page from the location bar).
     DVLOG(1) << "CompleteCancelRequest() url: " << request->url().spec();
     SSLCertErrorHandler* cert_error = AsSSLCertErrorHandler();
     if (cert_error)
       request->SimulateSSLError(error, cert_error->ssl_info());
     else
       request->SimulateError(error);
   }
   request_has_been_notified_ = true;
 
   // We're done with this object on the IO thread.
   Release();
 }
 
 void SSLErrorHandler::CompleteContinueRequest() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
-  // It is important that we notify the URLRequest only once.  If we try to
+  // It is important that we notify the net::URLRequest only once. If we try to
   // notify the request twice, it may no longer exist and |this| might have
   // already have been deleted.
   DCHECK(!request_has_been_notified_);
   if (request_has_been_notified_)
     return;
 
-  URLRequest* request = resource_dispatcher_host_->GetURLRequest(request_id_);
+  net::URLRequest* request =
+      resource_dispatcher_host_->GetURLRequest(request_id_);
   if (request) {
     // The request can be NULL if it was cancelled by the renderer (as the
     // result of the user navigating to a new page from the location bar).
     DVLOG(1) << "CompleteContinueRequest() url: " << request->url().spec();
     request->ContinueDespiteLastError();
   }
   request_has_been_notified_ = true;
 
   // We're done with this object on the IO thread.
   Release();
 }
 
 void SSLErrorHandler::CompleteTakeNoAction() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
-  // It is important that we notify the URLRequest only once.  If we try to
+  // It is important that we notify the net::URLRequest only once. If we try to
   // notify the request twice, it may no longer exist and |this| might have
   // already have been deleted.
   DCHECK(!request_has_been_notified_);
   if (request_has_been_notified_)
     return;
 
   request_has_been_notified_ = true;
 
   // We're done with this object on the IO thread.
   Release();
 }