gdata: Add GDataDirectoryService::AddEntryToDirectory()

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/message_loop_proxy.h"
 #include "base/platform_file.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
+#include "base/tracked_objects.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/gdata/gdata.pb.h"
 #include "chrome/browser/chromeos/gdata/gdata_util.h"
 #include "chrome/browser/chromeos/gdata/gdata_wapi_parser.h"
 #include "net/base/escape.h"
 
 namespace gdata {
 namespace {
 
 const char kSlash[] = "/";
 const char kEscapedSlash[] = "\xE2\x88\x95";
 
 // Extracts resource_id out of edit url.
 std::string ExtractResourceId(const GURL& url) {
   return net::UnescapeURLComponent(url.ExtractFileName(),
                                    net::UnescapeRule::URL_SPECIAL_CHARS);
 }
 
-// Replaces file entry |old_entry| with its fresh value |fresh_file|.
-void RefreshFileInternal(scoped_ptr<GDataFile> fresh_file,
-                         GDataEntry* old_entry) {
-  GDataDirectory* entry_parent = old_entry ? old_entry->parent() : NULL;
-  if (entry_parent) {
-    DCHECK_EQ(fresh_file->resource_id(), old_entry->resource_id());
-    DCHECK(old_entry->AsGDataFile());
-
-    entry_parent->RemoveEntry(old_entry);
-    entry_parent->AddEntry(fresh_file.release());
-  }
-}
-
 // Returns true if |proto| is a valid proto as the root directory.
 // Used to reject incompatible proto.
 bool IsValidRootDirectoryProto(const GDataDirectoryProto& proto) {
   const GDataEntryProto& entry_proto = proto.gdata_entry();
   // The title field for the root directory was originally empty, then
   // changed to "gdata", then changed to "drive". Discard the proto data if
   // the older formats are detected. See crbug.com/128133 for details.
   if (entry_proto.title() != "drive") {
     LOG(ERROR) << "Incompatible proto detected (bad title): "
                << entry_proto.title();
@@ skipping 396 matching lines @@
 
 GDataDirectoryService::~GDataDirectoryService() {
   // Note that children have a reference to root_,
   // so we need to delete them here.
   root_->RemoveChildren();
   RemoveEntryFromResourceMap(root_.get());
   DCHECK(resource_map_.empty());
   resource_map_.clear();
 }
 
+void GDataDirectoryService::AddEntryToDirectory(
+    const FilePath& directory_path,
+    GDataEntry* entry,
+    const FileOperationCallback& callback) {
+  GDataEntry* destination = FindEntryByPathSync(directory_path);
+  GDataFileError error = GDATA_FILE_ERROR_FAILED;
+  if (!destination) {
+    error = GDATA_FILE_ERROR_NOT_FOUND;
+  } else if (!destination->AsGDataDirectory()) {
+    error = GDATA_FILE_ERROR_NOT_A_DIRECTORY;
+  } else {
+    destination->AsGDataDirectory()->AddEntry(entry);
+    error = GDATA_FILE_OK;
+  }
+  if (!callback.is_null()) {
+    base::MessageLoopProxy::current()->PostTask(
+        FROM_HERE, base::Bind(callback, error));
+  }
+}
+
 void GDataDirectoryService::AddEntryToResourceMap(GDataEntry* entry) {
   // 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());
 }
@@ skipping 49 matching lines @@
     const GetEntryByResourceIdCallback& callback) {
   GDataEntry* entry = GetEntryByResourceId(resource_id);
   callback.Run(entry);
 }
 
 void GDataDirectoryService::RefreshFile(scoped_ptr<GDataFile> fresh_file) {
   DCHECK(fresh_file.get());
 
   // Need to get a reference here because Passed() could get evaluated first.
   const std::string& resource_id = fresh_file->resource_id();
-  GetEntryByResourceIdAsync(resource_id,
-      base::Bind(&RefreshFileInternal, base::Passed(&fresh_file)));
+  GetEntryByResourceIdAsync(
+      resource_id,
+      base::Bind(&GDataDirectoryService::RefreshFileInternal,
+                 base::Passed(&fresh_file)));
+}
+
+// static
+void GDataDirectoryService::RefreshFileInternal(
+    scoped_ptr<GDataFile> fresh_file,
+    GDataEntry* old_entry) {
+  GDataDirectory* entry_parent = old_entry ? old_entry->parent() : NULL;
+  if (entry_parent) {
+    DCHECK_EQ(fresh_file->resource_id(), old_entry->resource_id());
+    DCHECK(old_entry->AsGDataFile());
+
+    entry_parent->RemoveEntry(old_entry);
+    entry_parent->AddEntry(fresh_file.release());
+  }
 }
 
 // Convert to/from proto.
 
 // static
 void GDataEntry::ConvertProtoToPlatformFileInfo(
     const PlatformFileInfoProto& proto,
     base::PlatformFileInfo* file_info) {
   file_info->size = proto.size();
   file_info->is_directory = proto.is_directory();
@@ skipping 217 matching lines @@
   if (!root_->FromProto(proto.gdata_directory()))
     return false;
 
   origin_ = FROM_CACHE;
   largest_changestamp_ = proto.largest_changestamp();
 
   return true;
 }
 
 }  // namespace gdata