drive: Stop returning FilePath from GetResourceEntryById

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 <utility>
 #include <vector>
@@ skipping 236 matching lines @@
 TEST_F(ResourceMetadataTestOnUIThread, GetResourceEntryById_RootDirectory) {
   scoped_ptr<ResourceMetadata, test_util::DestroyHelperForTests>
       resource_metadata(new ResourceMetadata(temp_dir_.path(),
                                              blocking_task_runner_));
   FileError error = FILE_ERROR_FAILED;
   resource_metadata->Initialize(
       google_apis::test_util::CreateCopyResultCallback(&error));
   google_apis::test_util::RunBlockingPoolTask();
   ASSERT_EQ(FILE_ERROR_OK, error);
 
-  base::FilePath drive_file_path;
   scoped_ptr<ResourceEntry> entry;
 
   // Look up the root directory by its resource ID.
   resource_metadata->GetResourceEntryByIdOnUIThread(
       util::kDriveGrandRootSpecialResourceId,
-      google_apis::test_util::CreateCopyResultCallback(
-          &error, &drive_file_path, &entry));
+      google_apis::test_util::CreateCopyResultCallback(&error, &entry));
   google_apis::test_util::RunBlockingPoolTask();
   EXPECT_EQ(FILE_ERROR_OK, error);
-  EXPECT_EQ(base::FilePath::FromUTF8Unsafe("drive"), drive_file_path);
   ASSERT_TRUE(entry.get());
   EXPECT_EQ("drive", entry->base_name());
 }
 
 TEST_F(ResourceMetadataTestOnUIThread, GetResourceEntryById) {
   // Confirm that an existing file is found.
   FileError error = FILE_ERROR_FAILED;
-  base::FilePath drive_file_path;
   scoped_ptr<ResourceEntry> entry;
   resource_metadata_->GetResourceEntryByIdOnUIThread(
       "resource_id:file4",
-      google_apis::test_util::CreateCopyResultCallback(
-          &error, &drive_file_path, &entry));
+      google_apis::test_util::CreateCopyResultCallback(&error, &entry));
   google_apis::test_util::RunBlockingPoolTask();
   EXPECT_EQ(FILE_ERROR_OK, error);
-  EXPECT_EQ(base::FilePath::FromUTF8Unsafe("drive/root/dir1/file4"),
-            drive_file_path);
   ASSERT_TRUE(entry.get());
   EXPECT_EQ("file4", entry->base_name());
 
   // Confirm that a non existing file is not found.
   error = FILE_ERROR_FAILED;
   entry.reset();
   resource_metadata_->GetResourceEntryByIdOnUIThread(
       "file:non_existing",
-      google_apis::test_util::CreateCopyResultCallback(
-          &error, &drive_file_path, &entry));
+      google_apis::test_util::CreateCopyResultCallback(&error, &entry));
   google_apis::test_util::RunBlockingPoolTask();
   EXPECT_EQ(FILE_ERROR_NOT_FOUND, error);
   EXPECT_FALSE(entry.get());
 }
 
 TEST_F(ResourceMetadataTestOnUIThread, GetResourceEntryByPath) {
   // Confirm that an existing file is found.
   FileError error = FILE_ERROR_FAILED;
   scoped_ptr<ResourceEntry> entry;
   resource_metadata_->GetResourceEntryByPathOnUIThread(
@@ skipping 137 matching lines @@
   // The second entry should not be found.
   EXPECT_EQ(FILE_ERROR_NOT_FOUND, pair_result->second.error);
   EXPECT_EQ(base::FilePath::FromUTF8Unsafe("drive/root/dir1/non_existent"),
             pair_result->second.path);
   ASSERT_FALSE(pair_result->second.entry.get());
 }
 
 TEST_F(ResourceMetadataTestOnUIThread, RemoveEntry) {
   // Make sure file9 is found.
   FileError error = FILE_ERROR_FAILED;
-  base::FilePath drive_file_path;
   const std::string file9_resource_id = "resource_id:file9";
   scoped_ptr<ResourceEntry> entry;
   resource_metadata_->GetResourceEntryByIdOnUIThread(
       file9_resource_id,
-      google_apis::test_util::CreateCopyResultCallback(
-          &error, &drive_file_path, &entry));
+      google_apis::test_util::CreateCopyResultCallback(&error, &entry));
   google_apis::test_util::RunBlockingPoolTask();
   EXPECT_EQ(FILE_ERROR_OK, error);
-  EXPECT_EQ(base::FilePath::FromUTF8Unsafe("drive/root/dir1/dir3/file9"),
-            drive_file_path);
   ASSERT_TRUE(entry.get());
   EXPECT_EQ("file9", entry->base_name());
 
   // Remove file9 using RemoveEntry.
+  base::FilePath drive_file_path;
   resource_metadata_->RemoveEntryOnUIThread(
       file9_resource_id,
       google_apis::test_util::CreateCopyResultCallback(
           &error, &drive_file_path));
   google_apis::test_util::RunBlockingPoolTask();
   EXPECT_EQ(FILE_ERROR_OK, error);
   EXPECT_EQ(base::FilePath::FromUTF8Unsafe("drive/root/dir1/dir3"),
             drive_file_path);
 
   // file9 should no longer exist.
   resource_metadata_->GetResourceEntryByIdOnUIThread(
       file9_resource_id,
-      google_apis::test_util::CreateCopyResultCallback(
-          &error, &drive_file_path, &entry));
+      google_apis::test_util::CreateCopyResultCallback(&error, &entry));
   google_apis::test_util::RunBlockingPoolTask();
   EXPECT_EQ(FILE_ERROR_NOT_FOUND, error);
   EXPECT_FALSE(entry.get());
 
   // Look for dir3.
   const std::string dir3_resource_id = "resource_id:dir3";
   resource_metadata_->GetResourceEntryByIdOnUIThread(
       dir3_resource_id,
-      google_apis::test_util::CreateCopyResultCallback(
-          &error, &drive_file_path, &entry));
+      google_apis::test_util::CreateCopyResultCallback(&error, &entry));
   google_apis::test_util::RunBlockingPoolTask();
   EXPECT_EQ(FILE_ERROR_OK, error);
-  EXPECT_EQ(base::FilePath::FromUTF8Unsafe("drive/root/dir1/dir3"),
-            drive_file_path);
   ASSERT_TRUE(entry.get());
   EXPECT_EQ("dir3", entry->base_name());
 
   // Remove dir3 using RemoveEntry.
   resource_metadata_->RemoveEntryOnUIThread(
       dir3_resource_id,
       google_apis::test_util::CreateCopyResultCallback(
           &error, &drive_file_path));
   google_apis::test_util::RunBlockingPoolTask();
   EXPECT_EQ(FILE_ERROR_OK, error);
   EXPECT_EQ(base::FilePath::FromUTF8Unsafe("drive/root/dir1"), drive_file_path);
 
   // dir3 should no longer exist.
   resource_metadata_->GetResourceEntryByIdOnUIThread(
       dir3_resource_id,
-      google_apis::test_util::CreateCopyResultCallback(
-          &error, &drive_file_path, &entry));
+      google_apis::test_util::CreateCopyResultCallback(&error, &entry));
   google_apis::test_util::RunBlockingPoolTask();
   EXPECT_EQ(FILE_ERROR_NOT_FOUND, error);
   EXPECT_FALSE(entry.get());
 
   // Remove unknown resource_id using RemoveEntry.
   resource_metadata_->RemoveEntryOnUIThread(
       "foo",
       google_apis::test_util::CreateCopyResultCallback(
           &error, &drive_file_path));
   google_apis::test_util::RunBlockingPoolTask();
@@ skipping 20 matching lines @@
       google_apis::test_util::CreateCopyResultCallback(
           &error, &drive_file_path));
   google_apis::test_util::RunBlockingPoolTask();
   EXPECT_EQ(FILE_ERROR_OK, error);
   EXPECT_EQ(base::FilePath::FromUTF8Unsafe("drive/root/dir1/file8"),
             drive_file_path);
 
   // Look up the entry by its resource id and make sure it really moved.
   resource_metadata_->GetResourceEntryByIdOnUIThread(
       "resource_id:file8",
-      google_apis::test_util::CreateCopyResultCallback(
-          &error, &drive_file_path, &entry));
+      google_apis::test_util::CreateCopyResultCallback(&error, &entry));
   google_apis::test_util::RunBlockingPoolTask();
   EXPECT_EQ(FILE_ERROR_OK, error);
-  EXPECT_EQ(base::FilePath::FromUTF8Unsafe("drive/root/dir1/file8"),
-            drive_file_path);
 
   // Move non-existent file to drive/dir1. This should fail.
   resource_metadata_->MoveEntryToDirectoryOnUIThread(
       base::FilePath::FromUTF8Unsafe("drive/root/dir2/file8"),
       base::FilePath::FromUTF8Unsafe("drive/root/dir1"),
       google_apis::test_util::CreateCopyResultCallback(
           &error, &drive_file_path));
   google_apis::test_util::RunBlockingPoolTask();
   EXPECT_EQ(FILE_ERROR_NOT_FOUND, error);
   EXPECT_EQ(base::FilePath(), drive_file_path);
@@ skipping 36 matching lines @@
       google_apis::test_util::CreateCopyResultCallback(
           &error, &drive_file_path));
   google_apis::test_util::RunBlockingPoolTask();
   EXPECT_EQ(FILE_ERROR_OK, error);
   EXPECT_EQ(base::FilePath::FromUTF8Unsafe("drive/root/dir2/file8"),
             drive_file_path);
 
   // Make sure file is still ok.
   resource_metadata_->GetResourceEntryByIdOnUIThread(
       "resource_id:file8",
-      google_apis::test_util::CreateCopyResultCallback(
-          &error, &drive_file_path, &entry));
+      google_apis::test_util::CreateCopyResultCallback(&error, &entry));
   google_apis::test_util::RunBlockingPoolTask();
   EXPECT_EQ(FILE_ERROR_OK, error);
-  EXPECT_EQ(base::FilePath::FromUTF8Unsafe("drive/root/dir2/file8"),
-            drive_file_path);
 }
 
 TEST_F(ResourceMetadataTestOnUIThread, RenameEntry) {
   FileError error = FILE_ERROR_FAILED;
   base::FilePath drive_file_path;
   scoped_ptr<ResourceEntry> entry;
 
   // Rename file8 to file11.
   resource_metadata_->RenameEntryOnUIThread(
       base::FilePath::FromUTF8Unsafe("drive/root/dir2/file8"),
       "file11",
       google_apis::test_util::CreateCopyResultCallback(
           &error, &drive_file_path));
   google_apis::test_util::RunBlockingPoolTask();
   EXPECT_EQ(FILE_ERROR_OK, error);
   EXPECT_EQ(base::FilePath::FromUTF8Unsafe("drive/root/dir2/file11"),
             drive_file_path);
 
   // Lookup the file by resource id to make sure the file actually got renamed.
   resource_metadata_->GetResourceEntryByIdOnUIThread(
       "resource_id:file8",
-      google_apis::test_util::CreateCopyResultCallback(
-          &error, &drive_file_path, &entry));
+      google_apis::test_util::CreateCopyResultCallback(&error, &entry));
   google_apis::test_util::RunBlockingPoolTask();
   EXPECT_EQ(FILE_ERROR_OK, error);
-  EXPECT_EQ(base::FilePath::FromUTF8Unsafe("drive/root/dir2/file11"),
-            drive_file_path);
 
   // Rename to file7 to force a duplicate name.
   resource_metadata_->RenameEntryOnUIThread(
       base::FilePath::FromUTF8Unsafe("drive/root/dir2/file11"),
       "file7",
       google_apis::test_util::CreateCopyResultCallback(
           &error, &drive_file_path));
   google_apis::test_util::RunBlockingPoolTask();
   EXPECT_EQ(FILE_ERROR_OK, error);
   EXPECT_EQ(base::FilePath::FromUTF8Unsafe("drive/root/dir2/file7 (2)"),
@@ skipping 558 matching lines @@
     else
       ++directory_count;
   }
 
   EXPECT_EQ(7, file_count);
   EXPECT_EQ(6, directory_count);
 }
 
 }  // namespace internal
 }  // namespace drive