drive: Remove DriveFileType

chrome/browser/chromeos/drive/file_system/copy_operation.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/drive/file_system/copy_operation.h"
 
 #include <string>
 
 #include "base/file_util.h"
 #include "base/json/json_file_value_serializer.h"
@@ skipping 101 matching lines @@
                  weak_ptr_factory_.GetWeakPtr(),
                  local_dest_file_path,
                  callback));
 }
 
 void CopyOperation::OnGetFileCompleteForTransferFile(
     const base::FilePath& local_dest_file_path,
     const FileOperationCallback& callback,
     FileError error,
     const base::FilePath& local_file_path,
-    const std::string& unused_mime_type,
-    DriveFileType file_type) {
+    scoped_ptr<ResourceEntry> entry) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
   if (error != FILE_ERROR_OK) {
     callback.Run(error);
     return;
   }
 
   // GetFileByPath downloads the file from Drive to a local cache, which is then
   // copied to the actual destination path on the local file system using
@@ skipping 190 matching lines @@
                  weak_ptr_factory_.GetWeakPtr(),
                  dest_file_path,
                  callback));
 }
 
 void CopyOperation::OnGetFileCompleteForCopy(
     const base::FilePath& remote_dest_file_path,
     const FileOperationCallback& callback,
     FileError error,
     const base::FilePath& local_file_path,
-    const std::string& unused_mime_type,
-    DriveFileType file_type) {
+    scoped_ptr<ResourceEntry> entry) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
   if (error != FILE_ERROR_OK) {
     callback.Run(error);
     return;
   }
 
   // This callback is only triggered for a regular file via Copy().
-  DCHECK_EQ(REGULAR_FILE, file_type);
+  DCHECK(entry && !entry->file_specific_info().is_hosted_document());
   ScheduleTransferRegularFile(local_file_path, remote_dest_file_path, callback);
 }
 
 void CopyOperation::TransferFileFromLocalToRemoteAfterGetEntryInfo(
     const base::FilePath& local_src_file_path,
     const base::FilePath& remote_dest_file_path,
     const FileOperationCallback& callback,
     FileError error,
     scoped_ptr<ResourceEntry> entry) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ skipping 43 matching lines @@
       remote_dest_file_path.DirName(),
       resource_id,
       // Drop the document extension, which should not be
       // in the document title.
       remote_dest_file_path.BaseName().RemoveExtension().value(),
       callback);
 }
 
 }  // namespace file_system
 }  // namespace drive