Remove root resource id aliasing from DriveResourceMetadata.

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"
@@ skipping 91 matching lines @@
   } else if (about_resource.get()) {
     largest_changestamp_ = about_resource->largest_change_id();
 
     DVLOG(1) << "Root folder ID is " << about_resource->root_folder_id();
     DCHECK(!about_resource->root_folder_id().empty());
   } else {
     // A full update without AboutResouce will have no effective changestamp.
     NOTREACHED();
   }
 
-  ApplyEntryProtoMap(is_delta_feed);
+  ApplyEntryProtoMap(is_delta_feed, about_resource.Pass());
 
   // Shouldn't record histograms when processing delta feeds.
   if (!is_delta_feed)
     uma_stats.UpdateFileCountUmaHistograms();
 }
 
-void ChangeListProcessor::ApplyEntryProtoMap(bool is_delta_feed) {
+void ChangeListProcessor::ApplyEntryProtoMap(
+    bool is_delta_feed,
+    scoped_ptr<google_apis::AboutResource> about_resource) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   if (!is_delta_feed) {  // Full update.
+    DCHECK(about_resource);
+    changed_dirs_.insert(util::GetDriveGrandRootPath());
     changed_dirs_.insert(util::GetDriveMyDriveRootPath());
+    // After all nodes are cleared, create the MyDrive root directory at first.
     resource_metadata_->RemoveAll(
-        base::Bind(&ChangeListProcessor::ApplyNextEntryProtoAsync,
-                   weak_ptr_factory_.GetWeakPtr()));
+        base::Bind(
+            &ChangeListProcessor::ApplyEntryProto,
+            weak_ptr_factory_.GetWeakPtr(),
+            util::CreateMyDriveRootEntry(about_resource->root_folder_id())));
   } else {
     // Go through all entries generated by the feed and apply them to the local
     // snapshot of the file system.
     ApplyNextEntryProtoAsync();
   }
 }
 
 void ChangeListProcessor::ApplyNextEntryProtoAsync() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
@@ skipping 312 matching lines @@
 void ChangeListProcessor::Clear() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   entry_proto_map_.clear();
   changed_dirs_.clear();
   largest_changestamp_ = 0;
   on_complete_callback_.Reset();
 }
 
 }  // namespace drive