drive: Change the return type of ResourceMetadata's methods to FileError

chrome/browser/chromeos/drive/change_list_loader.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/drive/change_list_loader.h"
 
 #include <set>
 
 #include "base/callback.h"
 #include "base/callback_helpers.h"
@@ skipping 334 matching lines @@
   const bool is_initial_load = (!loaded_ && !IsRefreshing());
 
   // Register the callback function to be called when it is loaded.
   pending_load_callback_.push_back(callback);
 
   // If loading task is already running, do nothing.
   if (pending_load_callback_.size() > 1)
     return;
 
   // Check the current status of local metadata, and start loading if needed.
+  int64* local_changestamp = new int64(0);
   base::PostTaskAndReplyWithResult(
       blocking_task_runner_,
       FROM_HERE,
       base::Bind(&ResourceMetadata::GetLargestChangestamp,
-                 base::Unretained(resource_metadata_)),
+                 base::Unretained(resource_metadata_),
+                 local_changestamp),
       base::Bind(&ChangeListLoader::LoadAfterGetLargestChangestamp,
                  weak_ptr_factory_.GetWeakPtr(),
-                 is_initial_load));
+                 is_initial_load,
+                 base::Owned(local_changestamp)));
 }
 
-void ChangeListLoader::LoadAfterGetLargestChangestamp(bool is_initial_load,
-                                                      int64 local_changestamp) {
+void ChangeListLoader::LoadAfterGetLargestChangestamp(
+    bool is_initial_load,
+    const int64* local_changestamp,
+    FileError error) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-  if (is_initial_load && local_changestamp > 0) {
+  if (error != FILE_ERROR_OK) {
+    OnChangeListLoadComplete(error);
+    return;
+  }
+
+  if (is_initial_load && *local_changestamp > 0) {
     // The local data is usable. Flush callbacks to tell loading was successful.
     OnChangeListLoadComplete(FILE_ERROR_OK);
 
     // Continues to load from server in background.
     // Put dummy callbacks to indicate that fetching is still continuing.
     pending_load_callback_.push_back(
         base::Bind(&util::EmptyFileOperationCallback));
   }
 
   about_resource_loader_->UpdateAboutResource(
       base::Bind(&ChangeListLoader::LoadAfterGetAboutResource,
                  weak_ptr_factory_.GetWeakPtr(),
-                 local_changestamp));
+                 *local_changestamp));
 }
 
 void ChangeListLoader::LoadAfterGetAboutResource(
     int64 local_changestamp,
     google_apis::GDataErrorCode status,
     scoped_ptr<google_apis::AboutResource> about_resource) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   FileError error = GDataToFileError(status);
   if (error != FILE_ERROR_OK) {
@@ skipping 135 matching lines @@
 
   OnChangeListLoadComplete(error);
 
   FOR_EACH_OBSERVER(ChangeListLoaderObserver,
                     observers_,
                     OnLoadFromServerComplete());
 }
 
 }  // namespace internal
 }  // namespace drive