Remove root resource id aliasing from DriveResourceMetadata.

chrome/browser/chromeos/drive/change_list_loader.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_LOADER_H_
 #define CHROME_BROWSER_CHROMEOS_DRIVE_CHANGE_LIST_LOADER_H_
 
 #include <map>
 #include <string>
 #include <utility>
@@ skipping 137 matching lines @@
       google_apis::GDataErrorCode status,
       scoped_ptr<google_apis::AboutResource> about_resource);
 
   // Initiates the directory contents loading, based on |directory_fetch_info|.
   // When it is finished it just runs |callback| but no other callbacks in
   // |pending_load_callback_|, because it depends on the caller whether to flush
   // callbacks. Thus, the caller must be responsible for task flushing.
   void DoLoadDirectoryFromServer(const DirectoryFetchInfo& directory_fetch_info,
                                  const FileOperationCallback& callback);
 
+  // Part of DoLoadDirectoryFromServer. Called when GetEntryInfoByPath for
+  // mydrive creation is completed.
+  // |callback| must not be null.
+  void DoLoadDirectoryFromServerAfterGetEntryInfoByPath(

[kinaba, 2013/04/10 04:34:44]

How about naming these methods in a way that it explicitly tells this is
handling the special case of reading "/drive"?
And regard them as sub-routines of DoLoadDirectoryFromServer
(i.e., normal case uses LoadFromServer and special case uses the new ones).

+      const DirectoryFetchInfo& directory_fetch_info,
+      const FileOperationCallback& callback,
+      DriveFileError error,
+      scoped_ptr<DriveEntryProto> entry_proto);
+
+  // Part of DoLoadDIrectoryFromServer. Called when GetAboutResource for mydrive

[kinaba, 2013/04/10 04:34:44]

nit: DoLoadD<i>rectory

[hidehiko, 2013/04/10 06:11:19]

Done.

+  // root creation is completed.
+  // |callback must not be null.

[Haruki Sato, 2013/04/10 03:44:35]

|callback| ? missing "|".

[hidehiko, 2013/04/10 06:11:19]

Done.

[hidehiko, 2013/04/10 06:11:19]

Done.

+  void DoLoadDirectoryFromServerAfterGetAboutResource(
+      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(
       const DirectoryFetchInfo& directory_fetch_info,
       const FileOperationCallback& callback,
       ScopedVector<ChangeList> change_lists,
       DriveFileError error);
 
   // Part of DoLoadDirectoryFromServer(). Called after
   // DriveResourceMetadata::RefreshDirectory() is complete.
@@ skipping 118 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<ChangeListLoader> weak_ptr_factory_;
   DISALLOW_COPY_AND_ASSIGN(ChangeListLoader);
 };
 
 }  // namespace drive
 
 #endif  // CHROME_BROWSER_CHROMEOS_DRIVE_CHANGE_LIST_LOADER_H_