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

chrome/browser/chromeos/drive/file_system/open_file_operation_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/file_system/open_file_operation.h"
 
 #include <map>
 
 #include "base/file_util.h"
 #include "base/files/file_path.h"
@@ skipping 41 matching lines @@
   EXPECT_EQ(FILE_ERROR_OK, error);
   ASSERT_TRUE(base::PathExists(file_path));
   int64 local_file_size;
   ASSERT_TRUE(file_util::GetFileSize(file_path, &local_file_size));
   EXPECT_EQ(file_size, local_file_size);
 
   ASSERT_FALSE(close_callback.is_null());
   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) {
   const base::FilePath file_in_root(
       FILE_PATH_LITERAL("drive/root/not-exist.txt"));
 
   FileError error = FILE_ERROR_FAILED;
   base::FilePath file_path;
   base::Closure close_callback;
   operation_->OpenFile(
@@ skipping 47 matching lines @@
   EXPECT_TRUE(observer()->get_changed_paths().count(file_in_root.DirName()));
 
   EXPECT_EQ(FILE_ERROR_OK, error);
   ASSERT_TRUE(base::PathExists(file_path));
   int64 local_file_size;
   ASSERT_TRUE(file_util::GetFileSize(file_path, &local_file_size));
   EXPECT_EQ(0, local_file_size);  // Should be an empty file.
 
   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) {
   const base::FilePath file_in_root(
       FILE_PATH_LITERAL("drive/root/File 1.txt"));
   ResourceEntry src_entry;
   ASSERT_EQ(FILE_ERROR_OK, GetLocalResourceEntry(file_in_root, &src_entry));
   const int64 file_size = src_entry.file_info().size();
 
   FileError error = FILE_ERROR_FAILED;
@@ skipping 14 matching lines @@
   EXPECT_EQ(FILE_ERROR_OK, error);
   ASSERT_TRUE(base::PathExists(file_path));
   int64 local_file_size;
   ASSERT_TRUE(file_util::GetFileSize(file_path, &local_file_size));
   EXPECT_EQ(file_size, local_file_size);
 
   ASSERT_FALSE(close_callback.is_null());
   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);
   EXPECT_TRUE(cache_entry.is_present());
   EXPECT_TRUE(cache_entry.is_dirty());
 }
 
 TEST_F(OpenFileOperationTest, OpenOrCreateNonExistingFile) {
   const base::FilePath file_in_root(
       FILE_PATH_LITERAL("drive/root/not-exist.txt"));
@@ skipping 10 matching lines @@
   test_util::RunBlockingPoolTask();
 
   EXPECT_EQ(FILE_ERROR_OK, error);
   ASSERT_TRUE(base::PathExists(file_path));
   int64 local_file_size;
   ASSERT_TRUE(file_util::GetFileSize(file_path, &local_file_size));
   EXPECT_EQ(0, local_file_size);  // Should be an empty file.
 
   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) {
   const base::FilePath file_in_root(
       FILE_PATH_LITERAL("drive/root/File 1.txt"));
   ResourceEntry src_entry;
   ASSERT_EQ(FILE_ERROR_OK, GetLocalResourceEntry(file_in_root, &src_entry));
   const int64 file_size = src_entry.file_info().size();
 
   FileError error = FILE_ERROR_FAILED;
@@ skipping 36 matching lines @@
 
   // There still remains a client opening the file, so it shouldn't be
   // uploaded yet.
   EXPECT_TRUE(observer()->upload_needed_local_ids().empty());
 
   close_callback2.Run();
 
   // 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
 }  // namespace drive