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

chrome/browser/chromeos/drive/change_list_processor.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/drive/change_list_processor.h"
 
 #include "base/metrics/histogram.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/chromeos/drive/drive.pb.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
@@ skipping 336 matching lines @@
         new_entry.set_local_id(local_id);
         error = resource_metadata_->RefreshEntry(new_entry);
       } else {
         if (entry.file_info().is_directory()) {
           // No need to refresh, but update the changestamp.
           new_entry = existing_entry;
           new_entry.mutable_directory_specific_info()->set_changestamp(
               new_entry.directory_specific_info().changestamp());
           error = resource_metadata_->RefreshEntry(new_entry);
         }
-        DVLOG(1) << "Change was discarded for: "
-                 << resource_metadata_->GetFilePath(local_id).value();
+        DVLOG(1) << "Change was discarded for: " << entry.resource_id();
       }
       break;
     case FILE_ERROR_NOT_FOUND: {  // Adding a new entry.
       std::string local_id;
       error = resource_metadata_->AddEntry(new_entry, &local_id);
       break;
     }
     default:
       return error;
   }
@@ skipping 82 matching lines @@
   return FILE_ERROR_OK;
 }
 
 void ChangeListProcessor::UpdateChangedDirs(const ResourceEntry& entry) {
   DCHECK(!entry.resource_id().empty());
 
   std::string local_id;
   base::FilePath file_path;
   if (resource_metadata_->GetIdByResourceId(
           entry.resource_id(), &local_id) == FILE_ERROR_OK)
-    file_path = resource_metadata_->GetFilePath(local_id);
+    resource_metadata_->GetFilePath(local_id, &file_path);
 
   if (!file_path.empty()) {
     // Notify parent.
     changed_dirs_.insert(file_path.DirName());
 
     if (entry.file_info().is_directory()) {
       // Notify self if entry is a directory.
       changed_dirs_.insert(file_path);
 
       // Notify all descendants if it is a directory deletion.
       if (entry.deleted()) {
         std::set<base::FilePath> sub_directories;
         resource_metadata_->GetSubDirectoriesRecursively(local_id,
                                                          &sub_directories);
         changed_dirs_.insert(sub_directories.begin(), sub_directories.end());
       }
     }
   }
 }
 
 }  // namespace internal
 }  // namespace drive