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

chrome/browser/chromeos/drive/change_list_processor.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_processor.h"
 
 #include <utility>
 
 #include "base/metrics/histogram.h"
 #include "chrome/browser/chromeos/drive/drive.pb.h"
+#include "chrome/browser/chromeos/drive/drive_file_system_util.h"
 #include "chrome/browser/chromeos/drive/drive_resource_metadata.h"
 #include "chrome/browser/chromeos/drive/resource_entry_conversion.h"
 #include "chrome/browser/google_apis/gdata_wapi_parser.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
 
 namespace drive {
 
 namespace {
@@ skipping 31 matching lines @@
                          num_hosted_documents_);
     UMA_HISTOGRAM_COUNTS("Drive.NumberOfTotalFiles", num_total_files);
   }
 
  private:
   int num_regular_files_;
   int num_hosted_documents_;
 };
 
 ChangeListProcessor::ChangeListProcessor(
-    DriveResourceMetadata* resource_metadata)
+    DriveResourceMetadata* resource_metadata,
+    const std::string drive_root_resource_id)

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

Let's make this an argument of ApplyFeeds().
I think, the method can take AboutResource directly?

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

Done. Thank you for the advice!

   : resource_metadata_(resource_metadata),
+    drive_root_resource_id_(drive_root_resource_id),
     largest_changestamp_(0),
     ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) {
+  DCHECK(!drive_root_resource_id_.empty());
 }
 
 ChangeListProcessor::~ChangeListProcessor() {
 }
 
 void ChangeListProcessor::ApplyFeeds(
     const ScopedVector<google_apis::ResourceList>& feed_list,
     bool is_delta_feed,
     int64 root_feed_changestamp,
     const base::Closure& on_complete_callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!on_complete_callback.is_null());
 
   int64 delta_feed_changestamp = 0;
   ChangeListToEntryProtoMapUMAStats uma_stats;
+
   FeedToEntryProtoMap(feed_list, &delta_feed_changestamp, &uma_stats);
   // Note FeedToEntryProtoMap calls Clear() which resets on_complete_callback_.
   on_complete_callback_ = on_complete_callback;
   largest_changestamp_ =
       is_delta_feed ? delta_feed_changestamp : root_feed_changestamp;
+
+  // TODO(haruki): Add psuedo tree structure fo "drive"/root" and
+  // "drive/other" when we start using those namespaces.
   ApplyEntryProtoMap(is_delta_feed);
 
   // Shouldn't record histograms when processing delta feeds.
   if (!is_delta_feed)
     uma_stats.UpdateFileCountUmaHistograms();
 }
 
 void ChangeListProcessor::ApplyEntryProtoMap(bool is_delta_feed) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
@@ skipping 349 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   entry_proto_map_.clear();
   changed_dirs_.clear();
   root_upload_url_ = GURL();
   largest_changestamp_ = 0;
   on_complete_callback_.Reset();
 }
 
 }  // namespace drive