gdata: Get rid of GDataFileSystem::GetCacheState()

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"
@@ skipping 1806 matching lines @@
       GURL doc_icon = FindPreferredIcon(webapp_info->document_icons,
                                         kPreferredIconSize);
       if (!doc_icon.is_empty())
         app->SetString("docIcon", doc_icon.spec());
       app->SetString("objectType", webapp_info->object_type);
       app->SetBoolean("isPrimary", webapp_info->is_primary_selector);
       apps->Append(app);
     }
   }
 
-  system_service->file_system()->GetCacheState(
+  system_service->cache()->GetCacheEntryOnUIThread(
       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(
-      "isPinned",
-      gdata::GDataCache::IsCachePinned(cache_state));
+    bool success,
+    const gdata::GDataCache::CacheEntry& cache_entry) {
+  if (success) {

[hshi1, 2012/06/28 22:11:21]

Should any action be taken when (success == false)? I know that old code ignores
the error code, so maybe this is more of a TODO item.

[satorux1, 2012/06/28 22:41:17]

Previously, cache_state was CACHE_STATE_NONE on error. I guess it's safer to
keep that behavior. Done.

+    int cache_state = cache_entry.cache_state;
+    property_dict->SetBoolean(
+        "isPinned",
+        gdata::GDataCache::IsCachePinned(cache_state));
 
-  property_dict->SetBoolean(
-      "isPresent",
-      gdata::GDataCache::IsCachePresent(cache_state));
+    property_dict->SetBoolean(
+        "isPresent",
+        gdata::GDataCache::IsCachePresent(cache_state));
 
-  property_dict->SetBoolean(
-      "isDirty",
-      gdata::GDataCache::IsCacheDirty(cache_state));
+    property_dict->SetBoolean(
+        "isDirty",
+        gdata::GDataCache::IsCacheDirty(cache_state));
+  }
   CompleteGetFileProperties();
 }
 
 PinGDataFileFunction::PinGDataFileFunction() {
 }
 
 PinGDataFileFunction::~PinGDataFileFunction() {
 }
 
 bool PinGDataFileFunction::RunImpl() {
@@ skipping 517 matching lines @@
   gdata::GDataSystemService* system_service =
       gdata::GDataSystemServiceFactory::GetForProfile(profile_);
   if (!system_service || !system_service->file_system())
     return false;
 
   FilePath directory_path = GetVirtualPathFromURL(GURL(file_url_as_string));
   system_service->file_system()->RequestDirectoryRefresh(directory_path);
 
   return true;
 }