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

chrome/browser/chromeos/extensions/file_browser_private_api.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_browser_private_api.h"
 
 #include <utility>
 
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/singleton.h"
 #include "base/memory/weak_ptr.h"
 #include "base/string_split.h"
 #include "base/stringprintf.h"
 #include "base/time.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/extensions/file_handler_util.h"
 #include "chrome/browser/chromeos/extensions/file_manager_util.h"
+#include "chrome/browser/chromeos/gdata/gdata.pb.h"
 #include "chrome/browser/chromeos/gdata/gdata_file_system_proxy.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/extension_function_dispatcher.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/extensions/process_map.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 1551 matching lines @@
     base::DictionaryValue* property_dict,
     base::PlatformFileError error) {
   if (error != base::PLATFORM_FILE_OK) {
     property_dict->SetInteger("errorCode", error);
     CompleteGetFileProperties();
     return;
   }
 
   gdata::GDataSystemService* system_service =
       gdata::GDataSystemServiceFactory::GetForProfile(profile_);
-  system_service->file_system()->FindEntryByPathAsync(
+  system_service->file_system()->GetFileInfoByPathAsync(
       path,
-      base::Bind(&GetGDataFilePropertiesFunction::OnFileProperties,
+      base::Bind(&GetGDataFilePropertiesFunction::OnGetFileInfo,
                  this,
                  property_dict,
                  path));
 }
 
-void GetGDataFilePropertiesFunction::OnFileProperties(
+void GetGDataFilePropertiesFunction::OnGetFileInfo(
     base::DictionaryValue* property_dict,
     const FilePath& file_path,
     base::PlatformFileError error,
-    const FilePath& /* directory_path */,
-    gdata::GDataEntry* entry) {
+    scoped_ptr<gdata::GDataFileProto> file_proto) {

[Ben Chan, 2012/04/30 22:52:48]

DCHECK(property_dict);
DCHECK(file_proto.get());

[satorux1, 2012/04/30 23:04:36]

Added the former.
Didn't add the latter as it's possible that file is not found.

   if (error != base::PLATFORM_FILE_OK) {
     property_dict->SetInteger("errorCode", error);

[Ben Chan, 2012/04/30 22:52:48]

I believe the only semantics change is that this function now sets an error code
if |file_path| is directory?

[satorux1, 2012/04/30 23:04:36]

You are right. Before this patch, directory wasn't an error, but |property_dict|
was empty. I think the new behavior is correct. In fact, LOG(WARNING) <<
"Reading properties of a non-file at ..." s gone from this change, which is
good.

     CompleteGetFileProperties();
     return;
   }
 
-  gdata::GDataFile* file = entry->AsGDataFile();
-  if (!file) {
-    LOG(WARNING) << "Reading properties of a non-file at "
-                 << file_path.value();
-    CompleteGetFileProperties();
-    return;
+  property_dict->SetString("thumbnailUrl", file_proto->thumbnail_url());
+  if (!file_proto->alternate_url().empty())
+    property_dict->SetString("editUrl", file_proto->alternate_url());
+
+  if (!file_proto->gdata_entry().content_url().empty()) {
+    property_dict->SetString("contentUrl",
+                             file_proto->gdata_entry().content_url());
   }
 
-  property_dict->SetString("thumbnailUrl", file->thumbnail_url().spec());
-  if (!file->alternate_url().is_empty())
-    property_dict->SetString("editUrl", file->alternate_url().spec());
-
-  if (!file->content_url().is_empty())
-    property_dict->SetString("contentUrl", file->content_url().spec());
-
-  property_dict->SetBoolean("isHosted", file->is_hosted_document());
+  property_dict->SetBoolean("isHosted", file_proto->is_hosted_document());
 
   gdata::GDataSystemService* system_service =
       gdata::GDataSystemServiceFactory::GetForProfile(profile_);
   system_service->file_system()->GetCacheState(
-      file->resource_id(),
-      file->file_md5(),
+      file_proto->gdata_entry().resource_id(),
+      file_proto->file_md5(),
       base::Bind(
           &GetGDataFilePropertiesFunction::CacheStateReceived,
           this, property_dict));
 }
 
 void GetGDataFilePropertiesFunction::CacheStateReceived(
     base::DictionaryValue* property_dict,
     base::PlatformFileError error,
     int cache_state) {
   property_dict->SetBoolean(
@@ skipping 367 matching lines @@
   if (value->GetBoolean("cellularDisabled", &tmp)) {
     service->SetBoolean(prefs::kDisableGDataOverCellular, tmp);
   }
 
   if (value->GetBoolean("hostedFilesDisabled", &tmp)) {
     service->SetBoolean(prefs::kDisableGDataHostedFiles, tmp);
   }
 
   return true;
 }