Remove root resource id aliasing from DriveResourceMetadata.

chrome/browser/chromeos/drive/drive_file_system_util.cc

Index: chrome/browser/chromeos/drive/drive_file_system_util.cc
diff --git a/chrome/browser/chromeos/drive/drive_file_system_util.cc b/chrome/browser/chromeos/drive/drive_file_system_util.cc
index d390f718a088769e005086d429b114ed9e16dddd..eb7e842e2c78183585d25ab237eb46c210014358 100644
--- a/chrome/browser/chromeos/drive/drive_file_system_util.cc
+++ b/chrome/browser/chromeos/drive/drive_file_system_util.cc
@@ -160,6 +160,24 @@ bool IsSpecialResourceId(const std::string& resource_id) {
       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));