gdata: Remove use of FindEntryByPathAsync() from gdata_file_system_unittest.cc

chrome/browser/chromeos/gdata/gdata_file_system_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 <errno.h>
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 1057 matching lines @@
 
   int num_callback_invocations_;
   base::PlatformFileError expected_error_;
   int expected_cache_state_;
   GDataRootDirectory::CacheSubDirectoryType expected_sub_dir_type_;
   bool expect_outgoing_symlink_;
   std::string expected_file_extension_;
   int root_feed_changestamp_;
 };
 
-void AsyncInitializationCallback(int* counter,
-                                 int expected_counter,
-                                 const FilePath& expected_file_path,
-                                 MessageLoop* message_loop,
-                                 base::PlatformFileError error,
-                                 const FilePath& directory_path,
-                                 GDataEntry* entry) {
-  LOG(INFO) << "here";
+void AsyncInitializationCallback(
+    int* counter,
+    int expected_counter,
+    const FilePath& expected_file_path,
+    MessageLoop* message_loop,
+    base::PlatformFileError error,
+    scoped_ptr<GDataDirectoryProto> directory_proto) {
   ASSERT_EQ(base::PLATFORM_FILE_OK, error);
-  EXPECT_EQ(expected_file_path, directory_path);
-  EXPECT_FALSE(entry == NULL);
+  ASSERT_TRUE(directory_proto.get());
+  EXPECT_EQ(expected_file_path.value(),
+            directory_proto->gdata_entry().file_name());
 
   (*counter)++;
   if (*counter >= expected_counter)
     message_loop->Quit();
 }
 
 TEST_F(GDataFileSystemTest, DuplicatedAsyncInitialization) {
   int counter = 0;
-  FindEntryCallback callback = base::Bind(
+  ReadDirectoryCallback callback = base::Bind(
       &AsyncInitializationCallback,
       &counter,
       2,
       FilePath(FILE_PATH_LITERAL("gdata")),
       &message_loop_);
 
   EXPECT_CALL(*mock_doc_service_, GetAccountMetadata(_)).Times(1);
   EXPECT_CALL(*mock_doc_service_, GetDocuments(Eq(GURL()), _, _)).Times(1);
 
-  file_system_->FindEntryByPathAsync(
+  file_system_->ReadDirectoryByPathAsync(
       FilePath(FILE_PATH_LITERAL("gdata")), callback);
-  file_system_->FindEntryByPathAsync(
+  file_system_->ReadDirectoryByPathAsync(
       FilePath(FILE_PATH_LITERAL("gdata")), callback);
   message_loop_.Run();  // Wait to get our result
   EXPECT_EQ(2, counter);
 }
 
 TEST_F(GDataFileSystemTest, SearchRootDirectory) {
   LoadRootFeedDocument("root_feed.json");
 
   const FilePath kFilePath = FilePath(FILE_PATH_LITERAL("gdata"));
   GDataEntry* entry = FindEntry(FilePath(FILE_PATH_LITERAL(kFilePath)));
@@ skipping 1969 matching lines @@
   EXPECT_EQ(1, num_callback_invocations_);
   EXPECT_TRUE(CacheEntryExists(resource_id, md5));
 
   // Try to remove the file.
   num_callback_invocations_ = 0;
   TestRemoveFromCache(resource_id, base::PLATFORM_FILE_OK);
   EXPECT_EQ(1, num_callback_invocations_);
 }
 
 }   // namespace gdata