net: Remove typedef net::URLRequest URLRequest;

BUG=64263
TEST=compiled locally, trybots

Review URL: http://codereview.chromium.org/5384002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67762 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 20 insertions, 17 deletions

diff --git a/webkit/fileapi/file_system_operation.cc b/webkit/fileapi/file_system_operation.cc
index 97e2bfe..ba0f3d5 100644
--- a/webkit/fileapi/file_system_operation.cc
+++ b/webkit/fileapi/file_system_operation.cc
@@ -141,7 +141,8 @@ void FileSystemOperation::Write(
 #endif
   DCHECK(blob_url.is_valid());
   file_writer_delegate_.reset(new FileWriterDelegate(this, offset));
-  blob_request_.reset(new URLRequest(blob_url, file_writer_delegate_.get()));
+  blob_request_.reset(
+      new net::URLRequest(blob_url, file_writer_delegate_.get()));
   blob_request_->set_context(url_request_context);
   base::FileUtilProxy::CreateOrOpen(
       proxy_,
diff --git a/webkit/fileapi/file_writer_delegate.cc b/webkit/fileapi/file_writer_delegate.cc
index 21f69b1..bb6becf 100644
--- a/webkit/fileapi/file_writer_delegate.cc
+++ b/webkit/fileapi/file_writer_delegate.cc
@@ -29,7 +29,8 @@ FileWriterDelegate::FileWriterDelegate(
 FileWriterDelegate::~FileWriterDelegate() {
 }
 
-void FileWriterDelegate::Start(base::PlatformFile file, URLRequest* request) {
+void FileWriterDelegate::Start(base::PlatformFile file,
+                               net::URLRequest* request) {
   file_ = file;
   request_ = request;
   file_stream_.reset(
@@ -41,30 +42,30 @@ void FileWriterDelegate::Start(base::PlatformFile file, URLRequest* request) {
 }
 
 void FileWriterDelegate::OnReceivedRedirect(
-    URLRequest* request, const GURL& new_url, bool* defer_redirect) {
+    net::URLRequest* request, const GURL& new_url, bool* defer_redirect) {
   NOTREACHED();
   OnError(base::PLATFORM_FILE_ERROR_SECURITY);
 }
 
 void FileWriterDelegate::OnAuthRequired(
-    URLRequest* request, net::AuthChallengeInfo* auth_info) {
+    net::URLRequest* request, net::AuthChallengeInfo* auth_info) {
   NOTREACHED();
   OnError(base::PLATFORM_FILE_ERROR_SECURITY);
 }
 
 void FileWriterDelegate::OnCertificateRequested(
-    URLRequest* request, net::SSLCertRequestInfo* cert_request_info) {
+    net::URLRequest* request, net::SSLCertRequestInfo* cert_request_info) {
   NOTREACHED();
   OnError(base::PLATFORM_FILE_ERROR_SECURITY);
 }
 
 void FileWriterDelegate::OnSSLCertificateError(
-    URLRequest* request, int cert_error, net::X509Certificate* cert) {
+    net::URLRequest* request, int cert_error, net::X509Certificate* cert) {
   NOTREACHED();
   OnError(base::PLATFORM_FILE_ERROR_SECURITY);
 }
 
-void FileWriterDelegate::OnResponseStarted(URLRequest* request) {
+void FileWriterDelegate::OnResponseStarted(net::URLRequest* request) {
   DCHECK_EQ(request_, request);
   if (!request->status().is_success()) {
     OnError(base::PLATFORM_FILE_ERROR_FAILED);
@@ -78,7 +79,8 @@ void FileWriterDelegate::OnResponseStarted(URLRequest* request) {
   Read();
 }
 
-void FileWriterDelegate::OnReadCompleted(URLRequest* request, int bytes_read) {
+void FileWriterDelegate::OnReadCompleted(net::URLRequest* request,
+                                         int bytes_read) {
   DCHECK_EQ(request_, request);
   if (!request->status().is_success()) {
     OnError(base::PLATFORM_FILE_ERROR_FAILED);
diff --git a/webkit/fileapi/file_writer_delegate.h b/webkit/fileapi/file_writer_delegate.h
index ed35ce6..8e90a23 100644
--- a/webkit/fileapi/file_writer_delegate.h
+++ b/webkit/fileapi/file_writer_delegate.h
@@ -20,28 +20,28 @@ namespace fileapi {
 
 class FileSystemOperation;
 
-class FileWriterDelegate : public URLRequest::Delegate {
+class FileWriterDelegate : public net::URLRequest::Delegate {
  public:
   FileWriterDelegate(
       FileSystemOperation* write_operation,
       int64 offset);
   virtual ~FileWriterDelegate();
 
-  void Start(base::PlatformFile file, URLRequest* request);
+  void Start(base::PlatformFile file, net::URLRequest* request);
   base::PlatformFile file() {
     return file_;
   }
 
   virtual void OnReceivedRedirect(
-      URLRequest* request, const GURL& new_url, bool* defer_redirect);
+      net::URLRequest* request, const GURL& new_url, bool* defer_redirect);
   virtual void OnAuthRequired(
-      URLRequest* request, net::AuthChallengeInfo* auth_info);
+      net::URLRequest* request, net::AuthChallengeInfo* auth_info);
   virtual void OnCertificateRequested(
-      URLRequest* request, net::SSLCertRequestInfo* cert_request_info);
+      net::URLRequest* request, net::SSLCertRequestInfo* cert_request_info);
   virtual void OnSSLCertificateError(
-      URLRequest* request, int cert_error, net::X509Certificate* cert);
-  virtual void OnResponseStarted(URLRequest* request);
-  virtual void OnReadCompleted(URLRequest* request, int bytes_read);
+      net::URLRequest* request, int cert_error, net::X509Certificate* cert);
+  virtual void OnResponseStarted(net::URLRequest* request);
+  virtual void OnReadCompleted(net::URLRequest* request, int bytes_read);
 
  private:
   void Read();
@@ -60,7 +60,7 @@ class FileWriterDelegate : public URLRequest::Delegate {
   int bytes_read_;
   scoped_refptr<net::IOBufferWithSize> io_buffer_;
   scoped_ptr<net::FileStream> file_stream_;
-  URLRequest* request_;
+  net::URLRequest* request_;
   base::ScopedCallbackFactory<FileWriterDelegate> callback_factory_;
   ScopedRunnableMethodFactory<FileWriterDelegate> method_factory_;
 };