Remove root resource id aliasing from DriveResourceMetadata.

chrome/browser/chromeos/drive/drive_file_system_util.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/drive_file_system_util.h"
 
 #include <string>
 #include <utility>
 #include <vector>
 
@@ skipping 142 matching lines @@
   CR_DEFINE_STATIC_LOCAL(base::FilePath, drive_mount_path,
       (base::FilePath::FromUTF8Unsafe(kDriveMountPointPath)));
   return drive_mount_path;
 }
 
 bool IsSpecialResourceId(const std::string& resource_id) {
   return resource_id == kDriveGrandRootSpecialResourceId ||
       resource_id == kDriveOtherDirSpecialResourceId;
 }
 
+DriveEntryProto CreateMyDriveRootEntry(const std::string& root_resource_id) {
+  DriveEntryProto mydrive_root;
+  mydrive_root.mutable_file_info()->set_is_directory(true);
+  mydrive_root.set_resource_id(root_resource_id);
+  mydrive_root.set_parent_resource_id(util::kDriveGrandRootSpecialResourceId);
+  mydrive_root.set_title(util::kDriveMyDriveRootDirName);
+  return mydrive_root;
+}
+
+DriveEntryProto CreateOtherDirEntry() {
+  DriveEntryProto other_dir;
+  other_dir.mutable_file_info()->set_is_directory(true);
+  other_dir.set_resource_id(util::kDriveOtherDirSpecialResourceId);
+  other_dir.set_parent_resource_id(util::kDriveGrandRootSpecialResourceId);
+  other_dir.set_title(util::kDriveOtherDirName);
+  return other_dir;
+}
+
 const std::string& GetDriveMountPointPathAsString() {
   CR_DEFINE_STATIC_LOCAL(std::string, drive_mount_path_string,
       (kDriveMountPointPath));
   return drive_mount_path_string;
 }
 
 const base::FilePath& GetSpecialRemoteRootPath() {
   CR_DEFINE_STATIC_LOCAL(base::FilePath, drive_mount_path,
       (base::FilePath::FromUTF8Unsafe(kDriveSpecialRootPath)));
   return drive_mount_path;
@@ skipping 271 matching lines @@
   proto->set_last_modified(file_info.last_modified.ToInternalValue());
   proto->set_last_accessed(file_info.last_accessed.ToInternalValue());
   proto->set_creation_time(file_info.creation_time.ToInternalValue());
 }
 
 void EmptyFileOperationCallback(DriveFileError error) {
 }
 
 }  // namespace util
 }  // namespace drive