Revert 164876 - Set root resource ID upon full feed update.

chrome/browser/chromeos/drive/drive_resource_metadata.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_DRIVE_RESOURCE_METADATA_H_
 #define CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_RESOURCE_METADATA_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 40 matching lines @@
   INITIALIZED,
 };
 
 // Converts a ContentOrigin constant to a string of its name.
 std::string ContentOriginToString(ContentOrigin origin);
 
 // The root directory name used for the Google Drive file system tree. The
 // name is used in URLs for the file manager, hence user-visible.
 const FilePath::CharType kDriveRootDirectory[] = FILE_PATH_LITERAL("drive");
 
-// The resource ID for the root directory for WAPI is defined in the spec:
+// The resource ID for the root directory is defined in the spec:
 // https://developers.google.com/google-apps/documents-list/
-// Note that this special ID only applies to WAPI. Drive uses a non-constant
-// unique ID given in About resource.
-const char kWAPIRootDirectoryResourceId[] = "folder:root";
+const char kDriveRootDirectoryResourceId[] = "folder:root";
 
 // This should be incremented when incompatibility change is made in
 // drive.proto.
 const int32 kProtoVersion = 2;
 
 // Used for file operations like removing files.
 typedef base::Callback<void(DriveFileError error)>
     FileOperationCallback;
 
 // Callback similar to FileOperationCallback but with a given |file_path|.
@@ skipping 75 matching lines @@
   // The root directory content origin.
   ContentOrigin origin() const { return origin_; }
   void set_origin(ContentOrigin value) { origin_ = value; }
 
   // Creates a DriveFile instance.
   scoped_ptr<DriveFile> CreateDriveFile();
 
   // Creates a DriveDirectory instance.
   scoped_ptr<DriveDirectory> CreateDriveDirectory();
 
-  // Sets root directory resource ID and put root to ResourceMap.
-  void InitializeRootEntry(const std::string& id);
+  // Sets root directory resource id and initialize the root entry.
+  void InitializeRootEntry(const std::string& root_id);
 
   // Add |doc entry| to directory with path |directory_path| and invoke the
   // callback asynchronously.
   // |callback| must not be null.
   void AddEntryToDirectory(const FilePath& directory_path,
                            scoped_ptr<google_apis::DocumentEntry> doc_entry,
                            const FileMoveCallback& callback);
 
   // Moves entry specified by |file_path| to the directory specified by
   // |directory_path| and calls the callback asynchronously. Removes the entry
@@ skipping 144 matching lines @@
   // This should remain the last member so it'll be destroyed first and
   // invalidate its weak pointers before other members are destroyed.
   base::WeakPtrFactory<DriveResourceMetadata> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DriveResourceMetadata);
 };
 
 }  // namespace drive
 
 #endif  // CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_RESOURCE_METADATA_H_