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

chrome/browser/chromeos/drive/resource_metadata_unittest.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 <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 402 matching lines @@
   EXPECT_EQ(FILE_ERROR_NOT_FOUND, resource_metadata_->GetResourceEntryByPath(
       base::FilePath::FromUTF8Unsafe("drive/root/dir2"), &entry));
 
   // Make sure that directory cannot move under a file.
   dir_entry.set_parent_local_id(file_id);
   EXPECT_EQ(FILE_ERROR_NOT_A_DIRECTORY,
             resource_metadata_->RefreshEntry(dir_entry));
 
   // Cannot refresh root.
   dir_entry.Clear();
-  dir_entry.set_resource_id(util::kDriveGrandRootLocalId);
   dir_entry.set_local_id(util::kDriveGrandRootLocalId);
   dir_entry.set_title("new-root-name");
   dir_entry.set_parent_local_id(dir3_id);
   EXPECT_EQ(FILE_ERROR_INVALID_OPERATION,
             resource_metadata_->RefreshEntry(dir_entry));
 }
 
 TEST_F(ResourceMetadataTest, GetSubDirectoriesRecursively) {
   std::set<base::FilePath> sub_directories;
 
@@ skipping 285 matching lines @@
   // change stamp should be reset.
   EXPECT_EQ(0, resource_metadata_->GetLargestChangestamp());
 
   // root should continue to exist.
   ResourceEntry entry;
   ASSERT_EQ(FILE_ERROR_OK,
             resource_metadata_->GetResourceEntryByPath(
                 base::FilePath::FromUTF8Unsafe("drive"), &entry));
   EXPECT_EQ("drive", entry.base_name());
   ASSERT_TRUE(entry.file_info().is_directory());
-  EXPECT_EQ(util::kDriveGrandRootLocalId, entry.resource_id());
+  EXPECT_EQ(util::kDriveGrandRootLocalId, entry.local_id());
 
   // There are "other" and "trash" under "drive".
   ASSERT_EQ(FILE_ERROR_OK,
             resource_metadata_->ReadDirectoryByPath(
                 base::FilePath::FromUTF8Unsafe("drive"), &entries));
   EXPECT_EQ(2U, entries.size());
 
   // The "other" directory should be empty.
   ASSERT_EQ(FILE_ERROR_OK,
             resource_metadata_->ReadDirectoryByPath(
                 base::FilePath::FromUTF8Unsafe("drive/other"), &entries));
   EXPECT_TRUE(entries.empty());
 
   // The "trash" directory should be empty.
   ASSERT_EQ(FILE_ERROR_OK,
             resource_metadata_->ReadDirectoryByPath(
                 base::FilePath::FromUTF8Unsafe("drive/trash"), &entries));
   EXPECT_TRUE(entries.empty());
 }
 
 }  // namespace internal
 }  // namespace drive