drive: Change the return type of ResourceMetadata's methods to FileError

chrome/browser/chromeos/drive/file_system/create_directory_operation.cc

 // Copyright (c) 2013 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/drive/file_system/create_directory_operation.h"
 
 #include "chrome/browser/chromeos/drive/drive.pb.h"
 #include "chrome/browser/chromeos/drive/file_system/operation_observer.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
 #include "chrome/browser/chromeos/drive/resource_metadata.h"
@@ skipping 28 matching lines @@
   entry.mutable_file_info()->set_last_accessed(now.ToInternalValue());
   entry.set_parent_local_id(parent_local_id);
   entry.set_metadata_edit_state(ResourceEntry::DIRTY);
   entry.set_modification_date(base::Time::Now().ToInternalValue());
 
   std::string local_id;
   FileError error = metadata->AddEntry(entry, &local_id);
   if (error != FILE_ERROR_OK)
     return error;
 
+  base::FilePath path;
+  error = metadata->GetFilePath(local_id, &path);
+  if (error != FILE_ERROR_OK)
+    return error;
+
   updated_local_ids->insert(local_id);
-  changed_directories->insert(metadata->GetFilePath(local_id).DirName());
+  changed_directories->insert(path.DirName());
 
   if (remaining_path.empty())  // All directories are created successfully.
     return FILE_ERROR_OK;
 
   // Create descendant directories.
   return CreateDirectoryRecursively(metadata, local_id, remaining_path,
                                     updated_local_ids, changed_directories);
 }
 
 FileError UpdateLocalState(internal::ResourceMetadata* metadata,
                            const base::FilePath& directory_path,
                            bool is_exclusive,
                            bool is_recursive,
                            std::set<std::string>* updated_local_ids,
                            std::set<base::FilePath>* changed_directories) {
   // Get the existing deepest entry.
   std::vector<base::FilePath::StringType> components;
   directory_path.GetComponents(&components);
 
   if (components.empty() || components[0] != util::kDriveGrandRootDirName)
     return FILE_ERROR_NOT_FOUND;
 
   base::FilePath existing_deepest_path(components[0]);
   std::string local_id = util::kDriveGrandRootLocalId;
   for (size_t i = 1; i < components.size(); ++i) {
-    std::string child_local_id = metadata->GetChildId(local_id, components[i]);
-    if (child_local_id.empty())
+    std::string child_local_id;
+    FileError error =
+        metadata->GetChildId(local_id, components[i], &child_local_id);
+    if (error == FILE_ERROR_NOT_FOUND)
       break;
+    if (error != FILE_ERROR_OK)
+      return error;
     existing_deepest_path = existing_deepest_path.Append(components[i]);
     local_id = child_local_id;
   }
 
   ResourceEntry entry;
   FileError error = metadata->GetResourceEntryById(local_id, &entry);
   if (error != FILE_ERROR_OK)
     return error;
 
   if (!entry.file_info().is_directory())
@@ skipping 69 matching lines @@
 
   for (std::set<base::FilePath>::const_iterator it =
            changed_directories->begin(); it != changed_directories->end(); ++it)
     observer_->OnDirectoryChangedByOperation(*it);
 
   callback.Run(error);
 }
 
 }  // namespace file_system
 }  // namespace drive