gdata: Remove use of FindEntryByPathAsyncOnUI from CreateFileOnUIThread()

chrome/browser/chromeos/gdata/gdata_file_system.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_file_system.h"
 
 #include <set>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 1444 matching lines @@
                      is_exclusive,
                      is_recursive,
                      callback)));
 }
 
 void GDataFileSystem::CreateFile(const FilePath& file_path,
                                  bool is_exclusive,
                                  const FileOperationCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI) ||
          BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK(!callback.is_null());
+
   RunTaskOnUIThread(base::Bind(&GDataFileSystem::CreateFileOnUIThread,
                                ui_weak_ptr_,
                                file_path,
                                is_exclusive,
                                CreateRelayCallback(callback)));
 }
 
 void GDataFileSystem::CreateFileOnUIThread(
     const FilePath& file_path,
     bool is_exclusive,
     const FileOperationCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK(!callback.is_null());
 
   // First, checks the existence of a file at |file_path|.
-  FindEntryByPathAsyncOnUIThread(
+  directory_service_->GetEntryInfoByPath(
       file_path,
       base::Bind(&GDataFileSystem::OnGetEntryInfoForCreateFile,
                  ui_weak_ptr_,
                  file_path,
                  is_exclusive,
                  callback));
 }
 
 void GDataFileSystem::OnGetEntryInfoForCreateFile(
     const FilePath& file_path,
     bool is_exclusive,
     const FileOperationCallback& callback,
     GDataFileError result,
-    GDataEntry* entry) {
+    scoped_ptr<GDataEntryProto> entry_proto) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK(!callback.is_null());
 
   // The |file_path| is invalid. It is an error.
   if (result != GDATA_FILE_ERROR_NOT_FOUND &&
       result != GDATA_FILE_OK) {
-    if (!callback.is_null())
-      callback.Run(result);
+    callback.Run(result);
     return;
   }
 
   // An entry already exists at |file_path|.
   if (result == GDATA_FILE_OK) {
+    DCHECK(entry_proto.get());
     // If an exclusive mode is requested, or the entry is not a regular file,
     // it is an error.
     if (is_exclusive ||
-        !entry->AsGDataFile() ||
-        entry->AsGDataFile()->is_hosted_document()) {
-      if (!callback.is_null())
-        callback.Run(GDATA_FILE_ERROR_EXISTS);
+        entry_proto->file_info().is_directory() ||
+        entry_proto->file_specific_info().is_hosted_document()) {
+      callback.Run(GDATA_FILE_ERROR_EXISTS);
       return;
     }
 
     // Otherwise nothing more to do. Succeeded.
-    if (!callback.is_null())
-      callback.Run(GDATA_FILE_OK);
+    callback.Run(GDATA_FILE_OK);
     return;
   }
 
   // No entry found at |file_path|. Let's create a brand new file.
   // For now, it is implemented by uploading an empty file (/dev/null).
   // TODO(kinaba): http://crbug.com/135143. Implement in a nicer way.
   TransferRegularFile(FilePath(kEmptyFilePath), file_path, callback);
 }
 
 void GDataFileSystem::GetFileByPath(
@@ skipping 1936 matching lines @@
   }
 
   PlatformFileInfoProto entry_file_info;
   GDataEntry::ConvertPlatformFileInfoToProto(*file_info, &entry_file_info);
   *entry_proto->mutable_file_info() = entry_file_info;
   if (!callback.is_null())
     callback.Run(GDATA_FILE_OK, entry_proto.Pass());
 }
 
 }  // namespace gdata