Remove root resource id aliasing from DriveResourceMetadata.

chrome/browser/chromeos/drive/change_list_loader.h

Index: chrome/browser/chromeos/drive/change_list_loader.h
diff --git a/chrome/browser/chromeos/drive/change_list_loader.h b/chrome/browser/chromeos/drive/change_list_loader.h
index debf7ae073593c063bb6d2e2ede2581e20531029..f1849dd40bfa87161e88a4fdd3b27e07aad241b2 100644
--- a/chrome/browser/chromeos/drive/change_list_loader.h
+++ b/chrome/browser/chromeos/drive/change_list_loader.h
@@ -155,6 +155,24 @@ class ChangeListLoader {
   void DoLoadDirectoryFromServer(const DirectoryFetchInfo& directory_fetch_info,
                                  const FileOperationCallback& callback);
 
+  // Part of DoLoadDirectoryFromServer for the grand root ("/drive" directory).
+  // Called when GetEntryInfoByPath is completed.
+  // |callback| must not be null.
+  void DoLoadGrandRootDirectoryFromServerAfterGetEntryInfoByPath(
+      const DirectoryFetchInfo& directory_fetch_info,
+      const FileOperationCallback& callback,
+      DriveFileError error,
+      scoped_ptr<DriveEntryProto> entry_proto);
+
+  // Part of DoLoadDirectoryFromServer for the grand root ("/drive" directory).
+  // Called when GetAboutResource is completed.
+  // |callback| must not be null.
+  void DoLoadGrandRootDirectoryFromServerAfterGetAboutResource(
+      const DirectoryFetchInfo& directory_fetch_info,
+      const FileOperationCallback& callback,
+      google_apis::GDataErrorCode status,
+      scoped_ptr<google_apis::AboutResource> about_resource);
+
   // Part of DoLoadDirectoryFromServer(). Called after
   // LoadFromServer() is complete.
   void DoLoadDirectoryFromServerAfterLoad(