drive: Pass through AboutResouce from server among callbacks in ChangeListLoader.

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/command_line.h"
@@ skipping 278 matching lines @@
     google_apis::GDataErrorCode status,
     scoped_ptr<google_apis::AboutResource> about_resource) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
   DCHECK(refreshing_);
 
   int64 remote_changestamp = 0;
   if (util::GDataToDriveFileError(status) == DRIVE_FILE_OK) {
     DCHECK(about_resource);
     remote_changestamp = about_resource->largest_change_id();
+
+    DVLOG(1) << "Root folder ID is " << about_resource->root_folder_id();
+    DCHECK(!about_resource->root_folder_id().empty());
+    drive_root_resource_id_ = about_resource->root_folder_id();

[hidehiko, 2013/03/15 06:57:44]

How about passing through AboutResource to L761 via arguments?

[Haruki Sato, 2013/03/18 04:20:25]

Done.

   }
 
   resource_metadata_->GetLargestChangestamp(
       base::Bind(&ChangeListLoader::CompareChangestampsAndLoadIfNeeded,
                  weak_ptr_factory_.GetWeakPtr(),
                  directory_fetch_info,
                  callback,
                  remote_changestamp));
 }
 
@@ skipping 129 matching lines @@
   if (error != DRIVE_FILE_OK) {
     LOG(ERROR) << "Failed to load directory: "
                << directory_fetch_info.resource_id()
                << ": " << error;
     callback.Run(error);
     return;
   }
 
   // Do not use |change_list_processor_| as it may be in use for other
   // purposes.
-  ChangeListProcessor change_list_processor(resource_metadata_);
+  ChangeListProcessor change_list_processor(resource_metadata_,
+                                            drive_root_resource_id_);
   change_list_processor.FeedToEntryProtoMap(resource_list, NULL, NULL);
   resource_metadata_->RefreshDirectory(
       directory_fetch_info,
       change_list_processor.entry_proto_map(),
       base::Bind(&ChangeListLoader::DoLoadDirectoryFromServerAfterRefresh,
                  weak_ptr_factory_.GetWeakPtr(),
                  callback));
 }
 
 void ChangeListLoader::DoLoadDirectoryFromServerAfterRefresh(
@@ skipping 287 matching lines @@
 
 void ChangeListLoader::UpdateFromFeed(
     const ScopedVector<google_apis::ResourceList>& feed_list,
     bool is_delta_feed,
     int64 root_feed_changestamp,
     const base::Closure& update_finished_callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!update_finished_callback.is_null());
   DVLOG(1) << "Updating directory with a feed";
 
-  change_list_processor_.reset(new ChangeListProcessor(resource_metadata_));
+  change_list_processor_.reset(
+      new ChangeListProcessor(resource_metadata_, drive_root_resource_id_));
   // Don't send directory content change notification while performing
   // the initial content retrieval.
   const bool should_notify_changed_directories = is_delta_feed;
 
   change_list_processor_->ApplyFeeds(
       feed_list,
       is_delta_feed,
       root_feed_changestamp,
       base::Bind(&ChangeListLoader::NotifyDirectoryChanged,
                  weak_ptr_factory_.GetWeakPtr(),
@@ skipping 34 matching lines @@
 
   // Run the callback now that the filesystem is ready.
   load_finished_callback.Run(DRIVE_FILE_OK);
 
   FOR_EACH_OBSERVER(ChangeListLoaderObserver,
                     observers_,
                     OnFeedFromServerLoaded());
 }
 
 }  // namespace drive