Revert 137657 - Remove directory_path argument from chromeos::FindEntryCallback

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 "base/utf_string_conversions.h"
 #include "base/platform_file.h"
 #include "base/stringprintf.h"
 #include "base/string_util.h"
@@ skipping 501 matching lines @@
   file_path.GetComponents(&components);
 
   GDataDirectory* current_dir = this;
   FilePath directory_path;
 
   util::GDataSearchPathType path_type =
       util::GetSearchPathStatusForPathComponents(components);
 
   if (path_type == util::GDATA_SEARCH_PATH_ROOT ||
       path_type == util::GDATA_SEARCH_PATH_QUERY) {
-    callback.Run(base::PLATFORM_FILE_OK, fake_search_directory_.get());
+    callback.Run(base::PLATFORM_FILE_OK, file_path.DirName(),
+                 fake_search_directory_.get());
     return;
   }
 
   // If the path is under search path, we have to modify paremeters for finding
   // the entry.
   if (path_type != util::GDATA_SEARCH_PATH_INVALID) {
     if (!ModifyFindEntryParamsForSearchPath(file_path,
              &components, &current_dir, &directory_path)) {
-      callback.Run(base::PLATFORM_FILE_ERROR_NOT_FOUND, NULL);
+      callback.Run(base::PLATFORM_FILE_ERROR_NOT_FOUND, FilePath(), NULL);
       return;
     }
   }
 
   for (size_t i = 0; i < components.size() && current_dir; i++) {
     directory_path = directory_path.Append(current_dir->file_name());
 
     // Last element must match, if not last then it must be a directory.
     if (i == components.size() - 1) {
       if (current_dir->file_name() == components[i])
-        callback.Run(base::PLATFORM_FILE_OK, current_dir);
+        callback.Run(base::PLATFORM_FILE_OK, directory_path, current_dir);
       else
-        callback.Run(base::PLATFORM_FILE_ERROR_NOT_FOUND, NULL);
+        callback.Run(base::PLATFORM_FILE_ERROR_NOT_FOUND, FilePath(), NULL);
       return;
     }
 
     // Not the last part of the path, search for the next segment.
     GDataEntry* entry = current_dir->FindChild(components[i + 1]);
     if (!entry) {
-      callback.Run(base::PLATFORM_FILE_ERROR_NOT_FOUND, NULL);
+      callback.Run(base::PLATFORM_FILE_ERROR_NOT_FOUND, FilePath(), NULL);
       return;
     }
 
     // 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(base::PLATFORM_FILE_OK, entry);
+        callback.Run(base::PLATFORM_FILE_OK, directory_path, entry);
       else
-        callback.Run(base::PLATFORM_FILE_ERROR_NOT_FOUND, NULL);
+        callback.Run(base::PLATFORM_FILE_ERROR_NOT_FOUND, FilePath(), NULL);
 
       return;
     }
   }
-  callback.Run(base::PLATFORM_FILE_ERROR_NOT_FOUND, NULL);
+  callback.Run(base::PLATFORM_FILE_ERROR_NOT_FOUND, FilePath(), NULL);
 }
 
 GDataEntry* GDataRootDirectory::GetEntryByResourceId(
     const std::string& resource) {
   // GDataFileSystem has already locked.
   ResourceMap::const_iterator iter = resource_map_.find(resource);
   if (iter == resource_map_.end())
     return NULL;
   return iter->second;
 }
@@ skipping 296 matching lines @@
     }
 
     FromProto(*proto.get());
     set_origin(FROM_CACHE);
     set_refresh_time(base::Time::Now());
   }
   return ok;
 }
 
 }  // namespace gdata