gdata: Remove use of FindEntryByPathAsync() from file_manager_util.cc

chrome/browser/chromeos/extensions/file_manager_util.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/extensions/file_manager_util.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/extensions/file_handler_util.h"
+#include "chrome/browser/chromeos/gdata/gdata.pb.h"
 #include "chrome/browser/chromeos/gdata/gdata_operation_registry.h"
 #include "chrome/browser/chromeos/gdata/gdata_system_service.h"
 #include "chrome/browser/chromeos/gdata/gdata_util.h"
 #include "chrome/browser/extensions/crx_installer.h"
 #include "chrome/browser/extensions/extension_install_ui.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/plugin_prefs.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/simple_message_box.h"
@@ skipping 208 matching lines @@
           UTF8ToUTF16(path.BaseName().value())),
       l10n_util::GetStringUTF16(IDS_FILE_BROWSER_ERROR_VIEWING_FILE));
 }
 
 // Called when a file on GData was found. Opens the file found at |file_path|
 // in a new tab with a URL computed based on the |file_type|
 void OnGDataFileFound(Profile* profile,
                       const FilePath& file_path,
                       gdata::GDataFileType file_type,
                       base::PlatformFileError error,
-                      const FilePath& /* directory_path */,
-                      gdata::GDataEntry* entry) {
+                      scoped_ptr<gdata::GDataFileProto> file_proto) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-  if (error == base::PLATFORM_FILE_OK && entry && entry->AsGDataFile()) {
-    gdata::GDataFile* file = entry->AsGDataFile();
+  if (error == base::PLATFORM_FILE_OK) {
     GURL page_url;
     if (file_type == gdata::REGULAR_FILE) {
-      page_url = gdata::util::GetFileResourceUrl(file->resource_id(),
-                                                 file->file_name());
+      page_url = gdata::util::GetFileResourceUrl(
+          file_proto->gdata_entry().resource_id(),
+          file_proto->gdata_entry().file_name());
     } else if (file_type == gdata::HOSTED_DOCUMENT) {
-      page_url = file->alternate_url();
+      page_url = GURL(file_proto->alternate_url());
     } else {
       NOTREACHED();
     }
     OpenNewTab(page_url, profile);
   } else {
     ShowWarningMessageBox(profile, file_path);
   }
 }
 
 }  // namespace
@@ skipping 347 matching lines @@
 #if defined(OS_CHROMEOS)
     // Override gdata resource to point to internal handler instead of file:
     // URL.
     if (gdata::util::GetSpecialRemoteRootPath().IsParent(path)) {
       gdata::GDataSystemService* system_service =
           gdata::GDataSystemServiceFactory::GetForProfile(profile);
       if (!system_service)
         return false;
 
       // Open the file once the file is found.
-      system_service->file_system()->FindEntryByPathAsync(
+      system_service->file_system()->GetFileInfoByPathAsync(
           gdata::util::ExtractGDataPath(path),
           base::Bind(&OnGDataFileFound, profile, path, gdata::REGULAR_FILE));
       return true;
     }
 #endif
     OpenNewTab(page_url, (Profile*)NULL);
     return true;
   }
 
   if (IsSupportedGDocsExtension(file_extension.data())) {
     if (gdata::util::GetSpecialRemoteRootPath().IsParent(path)) {
       // The file is on Google Docs. Get the Docs from the GData service.
       gdata::GDataSystemService* system_service =
           gdata::GDataSystemServiceFactory::GetForProfile(profile);
       if (!system_service)
         return false;
 
-      system_service->file_system()->FindEntryByPathAsync(
+      system_service->file_system()->GetFileInfoByPathAsync(
           gdata::util::ExtractGDataPath(path),
           base::Bind(&OnGDataFileFound, profile, path,
                      gdata::HOSTED_DOCUMENT));
     } else {
       // The file is local (downloaded from an attachment or otherwise copied).
       // Parse the file to extract the Docs url and open this url.
       BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
           base::Bind(&ReadUrlFromGDocOnFileThread, path));
     }
     return true;
@@ skipping 67 matching lines @@
           GDataOperationRegistry::ProgressStatus>::const_iterator iter =
               list.begin();
        iter != list.end(); ++iter) {
     result_list->Append(
         ProgessStatusToDictionaryValue(profile, origin_url, *iter));
   }
   return result_list.release();
 }
 
 }  // namespace file_manager_util