drive: Stop comparing resource ID against kDriveGrandRootLocalId

chrome/browser/chromeos/drive/change_list_processor_unittest.cc

 // Copyright 2013 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/change_list_processor.h"
 
 #include "base/files/scoped_temp_dir.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/drive/drive.pb.h"
@@ skipping 507 matching lines @@
 
   // Add "Directory 1" to the map with a new name.
   ResourceEntry dir1;
   EXPECT_EQ(FILE_ERROR_OK, metadata_->GetResourceEntryByPath(
       util::GetDriveMyDriveRootPath().AppendASCII("Directory 1"), &dir1));
   dir1.set_title(dir1.title() + " (renamed)");
   change_lists[0]->mutable_entries()->push_back(dir1);
   change_lists[0]->mutable_parent_resource_ids()->push_back(kRootId);
 
   // Update the directory with the map.
+  ResourceEntry root;
+  EXPECT_EQ(FILE_ERROR_OK, metadata_->GetResourceEntryByPath(
+      util::GetDriveMyDriveRootPath(), &root));
   const int64 kNewChangestamp = 12345;
   base::FilePath file_path;
   EXPECT_EQ(FILE_ERROR_OK, ChangeListProcessor::RefreshDirectory(
       metadata_.get(),
-      DirectoryFetchInfo(kRootId, kNewChangestamp),
+      DirectoryFetchInfo(root.local_id(), kRootId, kNewChangestamp),
       change_lists.Pass(),
       &file_path));
   EXPECT_EQ(util::GetDriveMyDriveRootPath().value(), file_path.value());
 
   // The new changestamp should be set.
   ResourceEntry entry;
   EXPECT_EQ(FILE_ERROR_OK, metadata_->GetResourceEntryByPath(
       util::GetDriveMyDriveRootPath(), &entry));
   EXPECT_EQ(kNewChangestamp, entry.directory_specific_info().changestamp());
 
@@ skipping 17 matching lines @@
   ResourceEntry new_file;
   new_file.set_title("new_file");
   new_file.set_resource_id("new_file_id");
   // This entry should not be added because the parent ID does not match.
   change_lists[0]->mutable_parent_resource_ids()->push_back(
       "some-random-resource-id");
   change_lists[0]->mutable_entries()->push_back(new_file);
 
 
   // Update the directory.
+  ResourceEntry root;
+  EXPECT_EQ(FILE_ERROR_OK, metadata_->GetResourceEntryByPath(
+      util::GetDriveMyDriveRootPath(), &root));
   const int64 kNewChangestamp = 12345;
   base::FilePath file_path;
   EXPECT_EQ(FILE_ERROR_OK, ChangeListProcessor::RefreshDirectory(
       metadata_.get(),
-      DirectoryFetchInfo(kRootId, kNewChangestamp),
+      DirectoryFetchInfo(root.local_id(), kRootId, kNewChangestamp),
       change_lists.Pass(),
       &file_path));
   EXPECT_EQ(util::GetDriveMyDriveRootPath().value(), file_path.value());
 
   // "new_file" should not be added.
   ResourceEntry entry;
   EXPECT_EQ(FILE_ERROR_NOT_FOUND, metadata_->GetResourceEntryByPath(
       util::GetDriveMyDriveRootPath().AppendASCII(new_file.title()), &entry));
 }
 
@@ skipping 18 matching lines @@
   EXPECT_EQ(FILE_ERROR_OK, ApplyChangeList(change_lists.Pass(), &changed_dirs));
 
   // "new_file" should be added under drive/other.
   ResourceEntry entry;
   EXPECT_EQ(FILE_ERROR_OK, metadata_->GetResourceEntryByPath(
       util::GetDriveGrandRootPath().AppendASCII("other/new_file"), &entry));
 }
 
 }  // namespace internal
 }  // namespace drive