drive: Stop using resource ID to access local metadata in OpenFileOperation

chrome/browser/chromeos/drive/file_system/open_file_operation_unittest.cc

Index: chrome/browser/chromeos/drive/file_system/open_file_operation_unittest.cc
diff --git a/chrome/browser/chromeos/drive/file_system/open_file_operation_unittest.cc b/chrome/browser/chromeos/drive/file_system/open_file_operation_unittest.cc
index 6770af5ae17efb4f144ae24d7143693787e08576..3a7eba4e926770a4cc73721d551ae4cb769a600c 100644
--- a/chrome/browser/chromeos/drive/file_system/open_file_operation_unittest.cc
+++ b/chrome/browser/chromeos/drive/file_system/open_file_operation_unittest.cc
@@ -59,7 +59,7 @@ TEST_F(OpenFileOperationTest, OpenExistingFile) {
   close_callback.Run();
   EXPECT_EQ(
       1U,
-      observer()->upload_needed_local_ids().count(src_entry.resource_id()));
+      observer()->upload_needed_local_ids().count(src_entry.local_id()));
 }
 
 TEST_F(OpenFileOperationTest, OpenNonExistingFile) {
@@ -127,9 +127,9 @@ TEST_F(OpenFileOperationTest, CreateNonExistingFile) {
 
   ASSERT_FALSE(close_callback.is_null());
   close_callback.Run();
-  // Here we don't know about the resource id, so just make sure
-  // OnCacheFileUploadNeededByOperation is called actually.
-  EXPECT_EQ(1U, observer()->upload_needed_local_ids().size());
+  EXPECT_EQ(
+      1U,
+      observer()->upload_needed_local_ids().count(GetLocalId(file_in_root)));
 }
 
 TEST_F(OpenFileOperationTest, OpenOrCreateExistingFile) {
@@ -164,12 +164,12 @@ TEST_F(OpenFileOperationTest, OpenOrCreateExistingFile) {
   close_callback.Run();
   EXPECT_EQ(
       1U,
-      observer()->upload_needed_local_ids().count(src_entry.resource_id()));
+      observer()->upload_needed_local_ids().count(src_entry.local_id()));
 
   bool success = false;
   FileCacheEntry cache_entry;
   cache()->GetCacheEntryOnUIThread(
-      src_entry.resource_id(),
+      src_entry.local_id(),
       google_apis::test_util::CreateCopyResultCallback(&success, &cache_entry));
   test_util::RunBlockingPoolTask();
   EXPECT_TRUE(success);
@@ -200,9 +200,9 @@ TEST_F(OpenFileOperationTest, OpenOrCreateNonExistingFile) {
 
   ASSERT_FALSE(close_callback.is_null());
   close_callback.Run();
-  // Here we don't know about the resource id, so just make sure
-  // OnCacheFileUploadNeededByOperation is called actually.
-  EXPECT_EQ(1U, observer()->upload_needed_local_ids().size());
+  EXPECT_EQ(
+      1U,
+      observer()->upload_needed_local_ids().count(GetLocalId(file_in_root)));
 }
 
 TEST_F(OpenFileOperationTest, OpenFileTwice) {
@@ -259,7 +259,7 @@ TEST_F(OpenFileOperationTest, OpenFileTwice) {
   // Here, all the clients close the file, so it should be uploaded then.
   EXPECT_EQ(
       1U,
-      observer()->upload_needed_local_ids().count(src_entry.resource_id()));
+      observer()->upload_needed_local_ids().count(src_entry.local_id()));
 }
 
 }  // namespace file_system