Rename the drive: scheme with the externalfile: scheme.

chrome/browser/chromeos/fileapi/external_file_url_request_job.h

Index: chrome/browser/chromeos/fileapi/external_file_url_request_job.h
diff --git a/chrome/browser/chromeos/drive/drive_url_request_job.h b/chrome/browser/chromeos/fileapi/external_file_url_request_job.h
similarity index 60%
rename from chrome/browser/chromeos/drive/drive_url_request_job.h
rename to chrome/browser/chromeos/fileapi/external_file_url_request_job.h
index 1c0f0a6c5eaf10f3ba47e08bb857ca5b07164cca..528962e3e116a42274e11ff94798062aeb31b0ae 100644
--- a/chrome/browser/chromeos/drive/drive_url_request_job.h
+++ b/chrome/browser/chromeos/fileapi/external_file_url_request_job.h
@@ -1,9 +1,9 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 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.
 
-#ifndef CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_URL_REQUEST_JOB_H_
-#define CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_URL_REQUEST_JOB_H_
+#ifndef CHROME_BROWSER_CHROMEOS_FILEAPI_EXTERNAL_FILE_URL_REQUEST_JOB_H_
+#define CHROME_BROWSER_CHROMEOS_FILEAPI_EXTERNAL_FILE_URL_REQUEST_JOB_H_
 
 #include <string>
 
@@ -23,37 +23,38 @@ class NetworkDelegate;
 class URLRequest;
 }  // namespace net
 
-namespace drive {
+namespace chromeos {
 
-// DriveURLRequestJob is the gateway between network-level drive:...
+// ExternalFileURLRequestJob is the gateway between network-level drive:...
 // requests for drive resources and FileSystem.  It exposes content URLs
 // formatted as drive:<drive-file-path>.
 // The methods should be run on IO thread.
-class DriveURLRequestJob : public net::URLRequestJob {
+class ExternalFileURLRequestJob : public net::URLRequestJob {
  public:
-  typedef base::Callback<void(
-      net::Error,
-      const scoped_refptr<storage::FileSystemContext>& file_system_context,
-      const storage::FileSystemURL& file_system_url,
-      const std::string& mime_type)> DelegateCallback;
+  typedef base::Callback<
+      void(net::Error,
+           const scoped_refptr<storage::FileSystemContext>& file_system_context,
+           const storage::FileSystemURL& file_system_url,
+           const std::string& mime_type)> DelegateCallback;
 
-  DriveURLRequestJob(void* profile_id,
-                     net::URLRequest* request,
-                     net::NetworkDelegate* network_delegate);
+  ExternalFileURLRequestJob(void* profile_id,
+                            net::URLRequest* request,
+                            net::NetworkDelegate* network_delegate);
 
   // net::URLRequestJob overrides:
-  virtual void SetExtraRequestHeaders(const net::HttpRequestHeaders& headers)
-      OVERRIDE;
+  virtual void SetExtraRequestHeaders(
+      const net::HttpRequestHeaders& headers) OVERRIDE;
   virtual void Start() OVERRIDE;
   virtual void Kill() OVERRIDE;
   virtual bool GetMimeType(std::string* mime_type) const OVERRIDE;
-  virtual bool IsRedirectResponse(
-      GURL* location, int* http_status_code) OVERRIDE;
-  virtual bool ReadRawData(
-      net::IOBuffer* buf, int buf_size, int* bytes_read) OVERRIDE;
+  virtual bool IsRedirectResponse(GURL* location,
+                                  int* http_status_code) OVERRIDE;
+  virtual bool ReadRawData(net::IOBuffer* buf,
+                           int buf_size,
+                           int* bytes_read) OVERRIDE;
 
  protected:
-  virtual ~DriveURLRequestJob();
+  virtual ~ExternalFileURLRequestJob();
 
  private:
   // Called from a delegete helper on the UI thread.
@@ -87,10 +88,10 @@ class DriveURLRequestJob : public net::URLRequestJob {
 
   // This should remain the last member so it'll be destroyed first and
   // invalidate its weak pointers before other members are destroyed.
-  base::WeakPtrFactory<DriveURLRequestJob> weak_ptr_factory_;
-  DISALLOW_COPY_AND_ASSIGN(DriveURLRequestJob);
+  base::WeakPtrFactory<ExternalFileURLRequestJob> weak_ptr_factory_;
+  DISALLOW_COPY_AND_ASSIGN(ExternalFileURLRequestJob);
 };
 
-}  // namespace drive
+}  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_URL_REQUEST_JOB_H_
+#endif  // CHROME_BROWSER_CHROMEOS_FILEAPI_EXTERNAL_FILE_URL_REQUEST_JOB_H_