Get AboutResource as account metadata for Drive V2.

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"
 #include "base/file_util.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
 #include "base/metrics/histogram.h"
 #include "base/platform_file.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/values.h"
+#include "chrome/browser/chromeos/gdata/drive_api_parser.h"
 #include "chrome/browser/chromeos/gdata/drive_webapps_registry.h"
 #include "chrome/browser/chromeos/gdata/gdata.pb.h"
 #include "chrome/browser/chromeos/gdata/gdata_documents_service.h"
 #include "chrome/browser/chromeos/gdata/gdata_download_observer.h"
 #include "chrome/browser/chromeos/gdata/gdata_protocol_handler.h"
 #include "chrome/browser/chromeos/gdata/gdata_system_service.h"
 #include "chrome/browser/chromeos/gdata/gdata_util.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_notification_types.h"
@@ skipping 1926 matching lines @@
   DCHECK(params);
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   const FilePath& directory_path = params->search_file_path;
   if (error != GDATA_FILE_OK) {
     LOG(ERROR) << "Failed to refresh directory: " << directory_path.value()
                << ": " << error;
     return;
   }
 
-  int unused_delta_feed_changestamp = 0;
+  int64 unused_delta_feed_changestamp = 0;
   FeedToFileResourceMapUmaStats unused_uma_stats;
   FileResourceIdMap file_map;
   GDataWapiFeedProcessor feed_processor(directory_service_.get());
   error = feed_processor.FeedToFileResourceMap(
       *params->feed_list,
       &file_map,
       &unused_delta_feed_changestamp,
       &unused_uma_stats);
   if (error != GDATA_FILE_OK) {
     LOG(ERROR) << "Failed to convert feed: " << directory_path.value()
@@ skipping 200 matching lines @@
          BrowserThread::CurrentlyOn(BrowserThread::IO));
   RunTaskOnUIThread(base::Bind(&GDataFileSystem::GetAvailableSpaceOnUIThread,
                                ui_weak_ptr_,
                                CreateRelayCallback(callback)));
 }
 
 void GDataFileSystem::GetAvailableSpaceOnUIThread(
     const GetAvailableSpaceCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
+  if (gdata::util::IsDriveV2ApiEnabled()) {
+    documents_service_->GetAboutResource(
+      base::Bind(&GDataFileSystem::OnGetQuotaStats,

[satorux1, 2012/08/08 13:18:51]

OnGetAboutResource

We usually match the function name and the callback function.

[kochi, 2012/08/08 16:53:27]

Done.

+                 ui_weak_ptr_,
+                 callback));
+    return;
+  }
+
   documents_service_->GetAccountMetadata(
       base::Bind(&GDataFileSystem::OnGetAvailableSpace,
                  ui_weak_ptr_,
                  callback));
 }
 
 void GDataFileSystem::OnGetAvailableSpace(
     const GetAvailableSpaceCallback& callback,
     GDataErrorCode status,
     scoped_ptr<base::Value> data) {
@@ skipping 11 matching lines @@
   if (!feed.get()) {
     callback.Run(GDATA_FILE_ERROR_FAILED, -1, -1);
     return;
   }
 
   callback.Run(GDATA_FILE_OK,
                feed->quota_bytes_total(),
                feed->quota_bytes_used());
 }
 
+void GDataFileSystem::OnGetQuotaStats(
+    const GetAvailableSpaceCallback& callback,
+    GDataErrorCode status,
+    scoped_ptr<base::Value> data) {

[satorux1, 2012/08/08 13:18:51]

data -> better name?

[kochi, 2012/08/08 16:53:27]

Done.

named resource_json.

+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+
+  GDataFileError error = util::GDataToGDataFileError(status);
+  if (error != GDATA_FILE_OK) {
+    callback.Run(error, -1, -1);

[satorux1, 2012/08/08 13:18:51]

Historically, we check if the callback is null almost everywhere in
gdata_file_system.cc, as we allow null callbacks in certain places. However,
this is not a good practice. I'd suggest to add

DCHECK(!callback.is_null()) to this function, OnGetAvailableSpace(), and
GetAvailableSpaceOnUIThread()

[kochi, 2012/08/08 16:53:27]

Done.

+    return;
+  }
+
+  scoped_ptr<AboutResource> about;
+  if (data.get())
+    about = AboutResource::CreateFrom(*data);
+
+  if (!about.get()) {
+    callback.Run(GDATA_FILE_ERROR_FAILED, -1, -1);
+    return;
+  }
+
+  callback.Run(GDATA_FILE_OK,
+               about->quota_bytes_total(),
+               about->quota_bytes_used());
+}
+
 void GDataFileSystem::OnCreateDirectoryCompleted(
     const CreateDirectoryParams& params,
     GDataErrorCode status,
     scoped_ptr<base::Value> data) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   GDataFileError error = util::GDataToGDataFileError(status);
   if (error != GDATA_FILE_OK) {
     if (!params.callback.is_null())
       params.callback.Run(error);
@@ skipping 161 matching lines @@
 
   feed_loader_->LoadFromCache(
       false,  // should_load_from_server.
       // search_path doesn't matter if FindEntryCallback parameter is null .
       FilePath(),
       FindEntryCallback());
 }
 
 GDataFileError GDataFileSystem::UpdateFromFeedForTesting(
     const std::vector<DocumentFeed*>& feed_list,
-    int start_changestamp,
-    int root_feed_changestamp) {
+    int64 start_changestamp,
+    int64 root_feed_changestamp) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   return feed_loader_->UpdateFromFeed(feed_list,
                                       start_changestamp,
                                       root_feed_changestamp);
 }
 
 void GDataFileSystem::OnFilePathUpdated(const FileOperationCallback& callback,
                                         GDataFileError error,
                                         const FilePath& file_path) {
@@ skipping 1014 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