drive: Stop returning FilePath from GetResourceEntryById

chrome/browser/chromeos/drive/fake_file_system_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/fake_file_system.h"
 
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
 #include "chrome/browser/google_apis/fake_drive_service.h"
@@ skipping 28 matching lines @@
   base::MessageLoopForUI message_loop_;
   content::TestBrowserThread ui_thread_;
 
   scoped_ptr<google_apis::FakeDriveService> fake_drive_service_;
   scoped_ptr<FakeFileSystem> fake_file_system_;
 };
 
 TEST_F(FakeFileSystemTest, GetResourceEntryById) {
   FileError error = FILE_ERROR_FAILED;
   scoped_ptr<ResourceEntry> entry;
-  base::FilePath file_path;
+  const std::string resource_id = "folder:sub_dir_folder_resource_id";
 
   fake_file_system_->GetResourceEntryById(
-      "folder:sub_dir_folder_resource_id",
-      google_apis::test_util::CreateCopyResultCallback(
-          &error, &file_path, &entry));
-  google_apis::test_util::RunBlockingPoolTask();
-
-  ASSERT_EQ(FILE_ERROR_OK, error);
-  EXPECT_EQ(
-      util::GetDriveMyDriveRootPath().AppendASCII(
-          "Directory 1/Sub Directory Folder"),
-      file_path);
-  EXPECT_TRUE(entry);  // Just make sure something is returned.
-}
-
-TEST_F(FakeFileSystemTest,
-       GetResourceEntryById_PathCompatibleWithGetResourceEntryByPath) {
-  const std::string document_resource_id = "document:5_document_resource_id";
-
-  FileError error = FILE_ERROR_FAILED;
-  scoped_ptr<ResourceEntry> entry;
-  base::FilePath file_path;
-
-  // Get resource entry by resource id.
-  fake_file_system_->GetResourceEntryById(
-      document_resource_id,
-      google_apis::test_util::CreateCopyResultCallback(
-          &error, &file_path, &entry));
-  google_apis::test_util::RunBlockingPoolTask();
-
-  ASSERT_EQ(FILE_ERROR_OK, error);
-  ASSERT_TRUE(entry);
-  EXPECT_TRUE(entry->file_specific_info().is_hosted_document());
-
-  // Get resource entry by path given by GetResourceEntryById.
-  error = FILE_ERROR_FAILED;
-  entry.reset();
-  fake_file_system_->GetResourceEntryByPath(
-      file_path,
+      resource_id,
       google_apis::test_util::CreateCopyResultCallback(&error, &entry));
   google_apis::test_util::RunBlockingPoolTask();
 
   ASSERT_EQ(FILE_ERROR_OK, error);
-  ASSERT_TRUE(entry);
-  EXPECT_EQ(document_resource_id, entry->resource_id());
+  EXPECT_EQ(resource_id, entry->resource_id());
 }
 
 TEST_F(FakeFileSystemTest, GetFileContentByPath) {
   FileError initialize_error = FILE_ERROR_FAILED;
   scoped_ptr<ResourceEntry> entry;
   base::FilePath cache_file_path;
   base::Closure cancel_download;
   google_apis::test_util::TestGetContentCallback get_content_callback;
   FileError completion_error = FILE_ERROR_FAILED;
 
@@ skipping 107 matching lines @@
       util::GetDriveMyDriveRootPath().AppendASCII("Invalid File Name"),
       google_apis::test_util::CreateCopyResultCallback(&error, &entry));
   google_apis::test_util::RunBlockingPoolTask();
 
   ASSERT_EQ(FILE_ERROR_NOT_FOUND, error);
   ASSERT_FALSE(entry);
 }
 
 }  // namespace test_util
 }  // namespace drive