gdata: Get rid of callback from GDataDirectoryService::FindEntryByPath()

chrome/browser/chromeos/gdata/gdata_files.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/gdata/gdata_files.h"
 
 #include <vector>
 
 #include "base/platform_file.h"
 #include "base/string_util.h"
@@ skipping 449 matching lines @@
   // GDataFileSystem has already locked.
   DVLOG(1) << "AddEntryToResourceMap " << entry->resource_id();
   resource_map_.insert(std::make_pair(entry->resource_id(), entry));
 }
 
 void GDataDirectoryService::RemoveEntryFromResourceMap(GDataEntry* entry) {
   // GDataFileSystem has already locked.
   resource_map_.erase(entry->resource_id());
 }
 
-void GDataDirectoryService::FindEntryByPath(const FilePath& file_path,
-                                         const FindEntryCallback& callback) {
-  // GDataFileSystem has already locked.
-  DCHECK(!callback.is_null());
-
+GDataEntry* GDataDirectoryService::FindEntryByPathSync(
+    const FilePath& file_path) {
   std::vector<FilePath::StringType> components;
   file_path.GetComponents(&components);
 
   GDataDirectory* current_dir = root_.get();
   FilePath directory_path;
 
   for (size_t i = 0; i < components.size() && current_dir; i++) {
     directory_path = directory_path.Append(current_dir->base_name());
 
     // Last element must match, if not last then it must be a directory.
     if (i == components.size() - 1) {
       if (current_dir->base_name() == components[i])
-        callback.Run(GDATA_FILE_OK, current_dir);
+        return current_dir;
       else
-        callback.Run(GDATA_FILE_ERROR_NOT_FOUND, NULL);
-      return;
+        return NULL;
     }
 
     // Not the last part of the path, search for the next segment.
     GDataEntry* entry = current_dir->FindChild(components[i + 1]);
     if (!entry) {
-      callback.Run(GDATA_FILE_ERROR_NOT_FOUND, NULL);
-      return;
+      return NULL;
     }
 
     // Found file, must be the last segment.
     if (entry->file_info().is_directory) {
       // Found directory, continue traversal.
       current_dir = entry->AsGDataDirectory();
     } else {
       if ((i + 1) == (components.size() - 1))
-        callback.Run(GDATA_FILE_OK, entry);
+        return entry;
       else
-        callback.Run(GDATA_FILE_ERROR_NOT_FOUND, NULL);
-
-      return;
+        return NULL;
     }
   }
-  callback.Run(GDATA_FILE_ERROR_NOT_FOUND, NULL);
+  return NULL;
 }
 
 GDataEntry* GDataDirectoryService::GetEntryByResourceId(
     const std::string& resource) {
   // GDataFileSystem has already locked.
   ResourceMap::const_iterator iter = resource_map_.find(resource);
   return iter == resource_map_.end() ? NULL : iter->second;
 }
 
 void GDataDirectoryService::GetEntryByResourceIdAsync(
@@ skipping 240 matching lines @@
   if (!root_->FromProto(proto.gdata_directory()))
     return false;
 
   origin_ = FROM_CACHE;
   largest_changestamp_ = proto.largest_changestamp();
 
   return true;
 }
 
 }  // namespace gdata