gdata: Convert FindEntryByResourceIdSync() to asynchronous.

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 309 matching lines @@
   }
 
   FilePath GetCachePathForFile(GDataFile* file) {
     return cache_->GetCacheFilePath(file->resource_id(),
                                     file->file_md5(),
                                     GDataCache::CACHE_TYPE_TMP,
                                     GDataCache::CACHED_FILE_FROM_SERVER);
   }
 
   GDataEntry* FindEntry(const FilePath& file_path) {
-    GDataEntry* entry = NULL;
-    file_system_->root_->FindEntryByPath(
-        file_path, base::Bind(&ReadOnlyFindEntryCallback, &entry));
-    return entry;
+    base::AutoLock lock(file_system_->lock_);
+    return file_system_->GetGDataEntryByPath(file_path);
   }
 
   void FindAndTestFilePath(const FilePath& file_path) {
     GDataEntry* entry = FindEntry(file_path);
     ASSERT_TRUE(entry) << "Entry can't be found " << file_path.value();
     EXPECT_EQ(entry->GetFilePath(), file_path);
   }
 
   GDataEntry* FindEntryByResourceId(const std::string& resource_id) {
-    GDataEntry* entry = NULL;
-    file_system_->FindEntryByResourceIdSync(
-        resource_id, base::Bind(&ReadOnlyFindEntryCallback, &entry));
-    return entry;
+    GDataEntry* entry = file_system_->root_->GetEntryByResourceId(resource_id);
+    return entry ? entry->AsGDataFile() : NULL;
   }
 
   // Gets the entry info for |file_path| and compares the contents against
   // |entry|. Returns true if the entry info matches |entry|.
   bool GetEntryInfoAndCompare(const FilePath& file_path,
                               GDataEntry* entry) {
     file_system_->GetEntryInfoByPathAsync(
         file_path,
         base::Bind(&CallbackHelper::GetEntryInfoCallback,
                    callback_helper_.get()));
@@ skipping 3469 matching lines @@
   // Verify that the file was properly closed.
   EXPECT_EQ(base::PLATFORM_FILE_OK, callback_helper_->last_error_);
 
   // Verify that the cache state was changed as expected.
   VerifyCacheStateAfterCloseFile(callback_helper_->last_error_,
                                  file_resource_id,
                                  file_md5);
 }
 
 }   // namespace gdata