Remove root resource id aliasing from DriveResourceMetadata.

chrome/browser/chromeos/drive/change_list_processor.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_DRIVE_CHANGE_LIST_PROCESSOR_H_
 #define CHROME_BROWSER_CHROMEOS_DRIVE_CHANGE_LIST_PROCESSOR_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 73 matching lines @@
                            ChangeListToEntryProtoMapUMAStats* uma_stats);
 
   // A map of DriveEntryProto's representing a feed.
   const DriveEntryProtoMap& entry_proto_map() const { return entry_proto_map_; }
 
   // The set of changed directories as a result of feed processing.
   const std::set<base::FilePath>& changed_dirs() const { return changed_dirs_; }
 
  private:
   // Applies the pre-processed feed from entry_proto_map_ onto the filesystem.
-  void ApplyEntryProtoMap(bool is_delta_feed);
+  // If this is not delta feed update (i.e. |is_delta_feed| is false),
+  // |about_resource| must not be null.
+  void ApplyEntryProtoMap(
+      bool is_delta_feed,
+      scoped_ptr<google_apis::AboutResource> about_resource);
 
   // Apply the next item from entry_proto_map_ to the file system. The async
   // version posts to the message loop to avoid recursive stack-overflow.
   void ApplyNextEntryProto();
   void ApplyNextEntryProtoAsync();
 
   // Apply |entry_proto| to resource_metadata_.
   void ApplyEntryProto(const DriveEntryProto& entry_proto);
 
   // Continue ApplyEntryProto. This is a callback for
@@ skipping 84 matching lines @@
 
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate its weak pointers before any other members are destroyed.
   base::WeakPtrFactory<ChangeListProcessor> weak_ptr_factory_;
   DISALLOW_COPY_AND_ASSIGN(ChangeListProcessor);
 };
 
 }  // namespace drive
 
 #endif  // CHROME_BROWSER_CHROMEOS_DRIVE_CHANGE_LIST_PROCESSOR_H_