drive: Stop setting dummy resource ID for "drive" and "other"

chrome/browser/chromeos/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/resource_metadata.h"
 
 #include "base/guid.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/sys_info.h"
@@ skipping 101 matching lines @@
 }
 
 bool ResourceMetadata::SetUpDefaultEntries() {
   DCHECK(blocking_task_runner_->RunsTasksOnCurrentThread());
 
   // Initialize "/drive", "/drive/other" and "drive/trash".
   ResourceEntry entry;
   if (!storage_->GetEntry(util::kDriveGrandRootLocalId, &entry)) {
     ResourceEntry root;
     root.mutable_file_info()->set_is_directory(true);
-    // TODO(hashimoto): Stop setting dummy resource ID here.
-    root.set_resource_id(util::kDriveGrandRootLocalId);
     root.set_local_id(util::kDriveGrandRootLocalId);
     root.set_title(util::kDriveGrandRootDirName);
     SetBaseNameFromTitle(&root);
     if (!storage_->PutEntry(root))
       return false;
+  } else if (!entry.resource_id().empty()) {
+    // Old implementations used kDriveGrandRootLocalId as a resource ID.
+    entry.clear_resource_id();
+    if (!storage_->PutEntry(entry))
+      return false;
   }
   if (!storage_->GetEntry(util::kDriveOtherDirLocalId, &entry)) {
     ResourceEntry other_dir;
     other_dir.mutable_file_info()->set_is_directory(true);
-    // TODO(hashimoto): Stop setting dummy resource ID here.
-    other_dir.set_resource_id(util::kDriveOtherDirLocalId);
     other_dir.set_local_id(util::kDriveOtherDirLocalId);
     other_dir.set_parent_local_id(util::kDriveGrandRootLocalId);
     other_dir.set_title(util::kDriveOtherDirName);
     if (!PutEntryUnderDirectory(other_dir))
       return false;
+  } else if (!entry.resource_id().empty()) {
+    // Old implementations used kDriveOtherDirLocalId as a resource ID.
+    entry.clear_resource_id();
+    if (!storage_->PutEntry(entry))
+      return false;
   }
   if (!storage_->GetEntry(util::kDriveTrashDirLocalId, &entry)) {
     ResourceEntry trash_dir;
     trash_dir.mutable_file_info()->set_is_directory(true);
     trash_dir.set_local_id(util::kDriveTrashDirLocalId);
     trash_dir.set_parent_local_id(util::kDriveGrandRootLocalId);
     trash_dir.set_title(util::kDriveTrashDirName);
     if (!PutEntryUnderDirectory(trash_dir))
       return false;
   }
@@ skipping 318 matching lines @@
     for (size_t i = 0; i < children.size(); ++i) {
       if (!RemoveEntryRecursively(children[i]))
         return false;
     }
   }
   return storage_->RemoveEntry(id);
 }
 
 }  // namespace internal
 }  // namespace drive