Move FindEntryDelegate and friends to separate file.

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/utf_string_conversions.h"
 #include "base/platform_file.h"
 #include "base/stringprintf.h"
 #include "base/string_util.h"
+#include "chrome/browser/chromeos/gdata/find_entry_delegate.h"
 #include "chrome/browser/chromeos/gdata/gdata.pb.h"
 #include "chrome/browser/chromeos/gdata/gdata_parser.h"
 #include "net/base/escape.h"
 
 namespace {
 
 // Content refresh time.
 #ifndef NDEBUG
 const int kRefreshTimeInSec = 10;
 #else
@@ skipping 416 matching lines @@
     if (iter->second->AsGDataDirectory()) {
       RemoveEntriesFromResourceMap(
           iter->second->AsGDataDirectory()->children());
       continue;
     }
 
     resource_map_.erase(iter->second->resource_id());
   }
 }
 
+void GDataRootDirectory::FindEntryByPath(
+    const FilePath& file_path,
+    FindEntryDelegate* delegate) {
+  // GDataFileSystem has already locked.
+  DCHECK(delegate);
+
+  std::vector<FilePath::StringType> components;
+  file_path.GetComponents(&components);
+
+  GDataDirectory* current_dir = this;
+  FilePath directory_path;
+  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])
+        delegate->OnDone(base::PLATFORM_FILE_OK, directory_path, current_dir);
+      else
+        delegate->OnDone(base::PLATFORM_FILE_ERROR_NOT_FOUND, FilePath(), NULL);
+
+      return;
+    }
+
+    // Not the last part of the path, search for the next segment.
+    GDataFileCollection::const_iterator file_iter =
+        current_dir->children().find(components[i + 1]);
+    if (file_iter == current_dir->children().end()) {
+      delegate->OnDone(base::PLATFORM_FILE_ERROR_NOT_FOUND, FilePath(), NULL);
+      return;
+    }
+
+    // Found file, must be the last segment.
+    if (file_iter->second->file_info().is_directory) {
+      // Found directory, continue traversal.
+      current_dir = file_iter->second->AsGDataDirectory();
+    } else {
+      if ((i + 1) == (components.size() - 1)) {
+        delegate->OnDone(base::PLATFORM_FILE_OK,
+                         directory_path,
+                         file_iter->second);
+      } else {
+        delegate->OnDone(base::PLATFORM_FILE_ERROR_NOT_FOUND, FilePath(), NULL);
+      }
+
+      return;
+    }
+  }
+  delegate->OnDone(base::PLATFORM_FILE_ERROR_NOT_FOUND, FilePath(), NULL);
+}

[satorux1, 2012/04/25 06:01:37]

would it make sense to write a unit test for this function? Now it's easier to
write a focused unit test.

[achuithb, 2012/04/25 10:05:35]

I'm hoping to get rid of this entire function when I replace it with the
database lookup.

+
 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;
 }
 
 void GDataRootDirectory::SetCacheMap(const CacheMap& new_cache_map)  {
@@ skipping 267 matching lines @@
   bool ok = proto->ParseFromString(serialized_proto);
   if (ok) {
     FromProto(*proto.get());
     set_origin(FROM_CACHE);
     set_refresh_time(base::Time::Now());
   }
   return ok;
 }
 
 }  // namespace gdata