Remove root resource id aliasing from DriveResourceMetadata.

chrome/browser/chromeos/drive/drive_resource_metadata.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_resource_metadata.h"
 
 #include "base/file_util.h"
 #include "base/stringprintf.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/chromeos/drive/drive.pb.h"
@@ skipping 213 matching lines @@
     callback.Run(result->error, result->entries.Pass());
   }
 
   DriveFileError error;
   scoped_ptr<DriveEntryProtoVector> entries;
 };
 
 // DriveResourceMetadata class implementation.
 
 DriveResourceMetadata::DriveResourceMetadata(
-    const std::string& root_resource_id,
     const base::FilePath& data_directory_path,
     scoped_refptr<base::SequencedTaskRunner> blocking_task_runner)
     : data_directory_path_(data_directory_path),
       blocking_task_runner_(blocking_task_runner),
       storage_(new DriveResourceMetadataStorageDB(data_directory_path)),
-      root_resource_id_(root_resource_id),
       serialized_size_(0),
       ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 }
 
 void DriveResourceMetadata::Initialize(const FileOperationCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
   base::PostTaskAndReplyWithResult(
@@ skipping 45 matching lines @@
   SetUpDefaultEntries();
 
   return DRIVE_FILE_OK;
 }
 
 void DriveResourceMetadata::SetUpDefaultEntries() {
   DCHECK(blocking_task_runner_->RunsTasksOnCurrentThread());
 
   // Initialize the grand root and "other" entries. "/drive" and "/drive/other".
   // As an intermediate change, "/drive/root" is also added here.
-  // TODO(haruki): Move this initialization to change_list_loader where we
-  // can retrieve the root folder ID from the server.
   if (!storage_->GetEntry(util::kDriveGrandRootSpecialResourceId)) {
     DriveEntryProto root;
     root.mutable_file_info()->set_is_directory(true);
     root.set_resource_id(util::kDriveGrandRootSpecialResourceId);
     root.set_title(util::kDriveGrandRootDirName);
     storage_->PutEntry(CreateEntryWithProperBaseName(root));
   }
   if (!storage_->GetEntry(util::kDriveOtherDirSpecialResourceId)) {
-    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);
-    AddEntryToDirectory(other_dir);
-  }
-  if (!storage_->GetEntry(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);
-    AddEntryToDirectory(mydrive_root);
+    AddEntryToDirectory(util::CreateOtherDirEntry());
   }
 }
 
 void DriveResourceMetadata::DestroyOnBlockingPool() {
   DCHECK(blocking_task_runner_->RunsTasksOnCurrentThread());
   delete this;
 }
 
 void DriveResourceMetadata::ResetOnBlockingPool() {
   DCHECK(blocking_task_runner_->RunsTasksOnCurrentThread());
@@ skipping 881 matching lines @@
   storage_->PutEntry(
       CreateEntryWithProperBaseName(proto.drive_directory().drive_entry()));
   AddDescendantsFromProto(proto.drive_directory());
 
   storage_->SetLargestChangestamp(proto.largest_changestamp());
 
   return true;
 }
 
 }  // namespace drive