Rename GData* to Drive* in gdata.proto

chrome/browser/chromeos/gdata/gdata_download_observer.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_download_observer.h"
 
 #include <string>
 
 #include "base/callback.h"
 #include "base/file_util.h"
 #include "base/supports_user_data.h"
+#include "chrome/browser/chromeos/gdata/drive.pb.h"
 #include "chrome/browser/chromeos/gdata/drive_service_interface.h"
-#include "chrome/browser/chromeos/gdata/gdata.pb.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_upload_file_info.h"
 #include "chrome/browser/chromeos/gdata/gdata_uploader.h"
 #include "chrome/browser/chromeos/gdata/gdata_util.h"
 #include "chrome/browser/chromeos/gdata/gdata_wapi_parser.h"
 #include "chrome/browser/download/download_completion_blocker.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "net/base/net_util.h"
 
@@ skipping 119 matching lines @@
     // TODO(achuith): Handle this.
     NOTREACHED();
   }
 }
 
 // Callback for GDataFileSystem::GetEntryInfoByPath.
 void OnEntryFound(Profile* profile,
     const FilePath& gdata_dir_path,
     const base::Closure& substitute_callback,
     GDataFileError error,
-    scoped_ptr<GDataEntryProto> entry_proto) {
+    scoped_ptr<DriveEntryProto> entry_proto) {
   if (error == GDATA_FILE_ERROR_NOT_FOUND) {
     // Destination gdata directory doesn't exist, so create it.
     const bool is_exclusive = false, is_recursive = true;
     GetSystemService(profile)->file_system()->CreateDirectory(
         gdata_dir_path, is_exclusive, is_recursive,
         base::Bind(&OnCreateDirectory, substitute_callback));
   } else if (error == GDATA_FILE_OK) {
     substitute_callback.Run();
   } else {
     // TODO(achuith): Handle this.
@@ skipping 335 matching lines @@
           &GDataDownloadObserver::CreateUploadFileInfoAfterCheckExistence,
           weak_ptr_factory_.GetWeakPtr(),
           download->GetId(),
           base::Passed(&upload_file_info)));
 }
 
 void GDataDownloadObserver::CreateUploadFileInfoAfterCheckExistence(
     int32 download_id,
     scoped_ptr<UploadFileInfo> upload_file_info,
     GDataFileError error,
-    scoped_ptr<GDataEntryProto> entry_proto) {
+    scoped_ptr<DriveEntryProto> entry_proto) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(upload_file_info.get());
 
   if (entry_proto.get()) {
     // Make sure this isn't a directory.
     if (entry_proto->file_info().is_directory()) {
       DVLOG(1) << "Filename conflicts with existing directory: "
                << upload_file_info->title;
       return;
     }
@@ skipping 33 matching lines @@
             weak_ptr_factory_.GetWeakPtr(),
             download_id,
             base::Passed(&upload_file_info)));
   }
 }
 
 void GDataDownloadObserver::CreateUploadFileInfoAfterCheckTargetDir(
     int32 download_id,
     scoped_ptr<UploadFileInfo> upload_file_info,
     GDataFileError error,
-    scoped_ptr<GDataEntryProto> entry_proto) {
+    scoped_ptr<DriveEntryProto> entry_proto) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(upload_file_info.get());
 
   if (entry_proto.get()) {
     // TODO(hshi): if the upload directory is no longer valid, use the root
     // directory instead.
     upload_file_info->initial_upload_location =
         GURL(entry_proto->upload_url());
   } else {
     upload_file_info->initial_upload_location = GURL();
@@ skipping 91 matching lines @@
     file_system_->AddUploadedFile(UPLOAD_NEW_FILE,
                                   upload_data->virtual_dir_path(),
                                   entry.Pass(),
                                   download->GetTargetFilePath(),
                                   GDataCache::FILE_OPERATION_MOVE,
                                   base::Bind(&base::DoNothing));
   }
 }
 
 }  // namespace gdata