Rename GDataFileSystem* to DriveFileSystem*

chrome/browser/chromeos/gdata/gdata_protocol_handler.cc

 // Copyright (c) 2012 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/chromeos/gdata/gdata_protocol_handler.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/gdata/drive.pb.h"
+#include "chrome/browser/chromeos/gdata/drive_file_system_interface.h"
 #include "chrome/browser/chromeos/gdata/drive_service_interface.h"
 #include "chrome/browser/chromeos/gdata/gdata_errorcode.h"
-#include "chrome/browser/chromeos/gdata/gdata_file_system_interface.h"
 #include "chrome/browser/chromeos/gdata/gdata_system_service.h"
 #include "chrome/browser/chromeos/gdata/gdata_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/base/escape.h"
 #include "net/base/file_stream.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_request_headers.h"
@@ skipping 70 matching lines @@
   *resource_id = net::UnescapeURLComponent(id, kUrlPathUnescapeMask);
   return resource_id->size();
 }
 
 // Helper function to get GDataSystemService from Profile.
 GDataSystemService* GetSystemService() {
   return GDataSystemServiceFactory::GetForProfile(
       ProfileManager::GetDefaultProfile());
 }
 
-// Helper function to get GDataFileSystem from Profile on UI thread.
-void GetFileSystemOnUIThread(GDataFileSystemInterface** file_system) {
+// Helper function to get DriveFileSystem from Profile on UI thread.
+void GetFileSystemOnUIThread(DriveFileSystemInterface** file_system) {
   GDataSystemService* system_service = GetSystemService();
   *file_system = system_service ? system_service->file_system() : NULL;
 }
 
 // Helper function to cancel GData download operation on UI thread.
 void CancelGDataDownloadOnUIThread(const FilePath& gdata_file_path) {
   GDataSystemService* system_service = GetSystemService();
   if (system_service)
     system_service->drive_service()->operation_registry()->CancelForFilePath(
         gdata_file_path);
@@ skipping 14 matching lines @@
   virtual int GetResponseCode() const OVERRIDE;
   virtual bool ReadRawData(net::IOBuffer* buf,
                            int buf_size,
                            int* bytes_read) OVERRIDE;
 
  protected:
   virtual ~GDataURLRequestJob();
 
  private:
   // Helper for Start() to let us start asynchronously.
-  void StartAsync(GDataFileSystemInterface** file_system);
+  void StartAsync(DriveFileSystemInterface** file_system);
 
   // Helper methods for Delegate::OnUrlFetchDownloadData and ReadRawData to
   // receive download data and copy to response buffer.
   // For detailed description of logic, refer to comments in definitions of
   // Start() and ReadRawData().
 
   void OnUrlFetchDownloadData(GDataErrorCode error,
                               scoped_ptr<std::string> download_data);
   // Called from ReadRawData, returns true if data is ready, false otherwise.
   bool ContinueReadFromDownloadData(int* bytes_read);
   // Copies from download buffer into response buffer.
   bool ReadFromDownloadData();
 
   // Helper callback for handling async responses from
-  // GDataFileSystem::GetFileByResourceId().
+  // DriveFileSystem::GetFileByResourceId().
   void OnGetFileByResourceId(DriveFileError error,
                              const FilePath& local_file_path,
                              const std::string& mime_type,
                              DriveFileType file_type);
 
   // Helper callback for GetFileSizeOnBlockingPool that sets |remaining_bytes_|
   // to |file_size|, and notifies result for Start().
   void OnGetFileSize(int64 *file_size);
 
   // Helper callback for GetEntryInfoByResourceId invoked by StartAsync.
@@ skipping 21 matching lines @@
   // Helper methods to fomulate and notify about response status, info and
   // headers.
   void NotifySuccess();
   void NotifyFailure(int);
   void HeadersCompleted(int status_code, const std::string& status_txt);
 
   // Helper method to close |stream_|.
   void CloseFileStream();
 
   scoped_ptr<base::WeakPtrFactory<GDataURLRequestJob> > weak_ptr_factory_;
-  GDataFileSystemInterface* file_system_;
+  DriveFileSystemInterface* file_system_;
 
   bool error_;  // True if we've encountered an error.
   bool headers_set_;  // True if headers have been set.
 
   FilePath local_file_path_;
   FilePath gdata_file_path_;
   std::string mime_type_;
   int64 initial_file_size_;
   int64 remaining_bytes_;
   scoped_ptr<net::FileStream> stream_;
@@ skipping 76 matching lines @@
   // NotifySuccess internally calls ReadRawData, hence we only notify success
   // after we have:
   // - received the first chunk of download data if file is downloaded
   // - gotten size of physical file if file exists in cache.
 
   // Request job is created and runs on IO thread but getting file system via
   // profile needs to happen on UI thread, so post GetFileSystemOnUIThread to
   // UI thread; StartAsync reply task will proceed with actually starting the
   // request.
 
-  GDataFileSystemInterface** file_system = new GDataFileSystemInterface*(NULL);
+  DriveFileSystemInterface** file_system = new DriveFileSystemInterface*(NULL);
   BrowserThread::PostTaskAndReply(
       BrowserThread::UI,
       FROM_HERE,
       base::Bind(&GetFileSystemOnUIThread, file_system),
       base::Bind(&GDataURLRequestJob::StartAsync,
                  weak_ptr_factory_->GetWeakPtr(),
                  base::Owned(file_system)));
 }
 
 void GDataURLRequestJob::Kill() {
   DVLOG(1) << "Killing request";
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   CloseFileStream();
 
   // If download operation for gdata file (via
-  // GDataFileSystem::GetFileByResourceId) is still in progress, cancel it by
+  // DriveFileSystem::GetFileByResourceId) is still in progress, cancel it by
   // posting a task on the UI thread.
   // Download operation is still in progress if:
   // 1) |local_file_path_| is still empty; it gets filled when callback for
   //    GetFileByResourceId is called, AND
   // 2) we're still streaming download data i.e. |remaining_bytes_| > 0; if
   //    we've finished streaming data, we want to avoid possibly killing last
   //    part of the download process where the last chunk is written to file;
   //    if we're reading directly from cache file, |remaining_bytes_| doesn't
   //    matter 'cos |local_file_path_| will not be empty.
   if (file_system_ && !gdata_file_path_.empty() && local_file_path_.empty() &&
@@ skipping 132 matching lines @@
 }
 
 //======================= GDataURLRequestJob protected methods ================
 
 GDataURLRequestJob::~GDataURLRequestJob() {
   CloseFileStream();
 }
 
 //======================= GDataURLRequestJob private methods ===================
 
-void GDataURLRequestJob::StartAsync(GDataFileSystemInterface** file_system) {
+void GDataURLRequestJob::StartAsync(DriveFileSystemInterface** file_system) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   file_system_ = *file_system;
 
   if (!request_ || !file_system_) {
     LOG(WARNING) << "Failed to start request: null "
                  << (!request_ ? "request" : "file system");
     NotifyStartError(net::URLRequestStatus(net::URLRequestStatus::FAILED,
                                            net::ERR_FAILED));
     return;
@@ skipping 448 matching lines @@
 GDataProtocolHandler::~GDataProtocolHandler() {
 }
 
 net::URLRequestJob* GDataProtocolHandler::MaybeCreateJob(
     net::URLRequest* request) const {
   DVLOG(1) << "Handling url: " << request->url().spec();
   return new GDataURLRequestJob(request);
 }
 
 }  // namespace gdata