drive: Handle ApplyEntryMap correctly

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 266 matching lines @@
       it = it_parent;
     }
 
     // Apply the parent first.
     std::reverse(entries.begin(), entries.end());
     for (size_t i = 0; i < entries.size(); ++i) {
       // Skip root entry in the change list. We don't expect servers to send
       // root entry, but we should better be defensive (see crbug.com/297259).
       ResourceEntryMap::iterator it = entries[i];
       if (it->first != root.resource_id()) {
         // TODO(hashimoto): Handle ApplyEntry errors correctly.

[kinaba, 2014/04/28 08:28:52]

nit: Do you still need this TODO comment?

[hashimoto, 2014/04/28 09:30:54]

Done.

         FileError error = ApplyEntry(it->second);
-        DLOG_IF(WARNING, error != FILE_ERROR_OK)
-            << "ApplyEntry failed: " << FileErrorToString(error)
-            << ", title = " << it->second.title();
+        if (error != FILE_ERROR_OK) {
+          LOG(ERROR) << "ApplyEntry failed: " << FileErrorToString(error)
+                     << ", title = " << it->second.title();
+          return error;
+        }
       }
       entry_map_.erase(it);
     }
   }
 
   // Apply deleted entries.
   for (size_t i = 0; i < deleted_resource_ids.size(); ++i) {
     std::string local_id;
     FileError error = resource_metadata_->GetIdByResourceId(
         deleted_resource_ids[i], &local_id);
-    if (error == FILE_ERROR_OK)
-      error = resource_metadata_->RemoveEntry(local_id);
-
-    DLOG_IF(WARNING, error != FILE_ERROR_OK && error != FILE_ERROR_NOT_FOUND)
-        << "Failed to delete: " << FileErrorToString(error)
-        << ", resource_id = " << deleted_resource_ids[i];
+    switch (error) {
+      case FILE_ERROR_OK:
+        error = resource_metadata_->RemoveEntry(local_id);
+        break;
+      case FILE_ERROR_NOT_FOUND:
+        error = FILE_ERROR_OK;
+        break;
+      default:
+        break;
+    }
+    if (error != FILE_ERROR_OK) {
+      LOG(ERROR) << "Failed to delete: " << FileErrorToString(error)
+                 << ", resource_id = " << deleted_resource_ids[i];
+      return error;
+    }
   }
 
   return FILE_ERROR_OK;
 }
 
 FileError ChangeListProcessor::ApplyEntry(const ResourceEntry& entry) {
   DCHECK(!entry.deleted());
   DCHECK(parent_resource_id_map_.count(entry.resource_id()));
   const std::string& parent_resource_id =
       parent_resource_id_map_[entry.resource_id()];
@@ skipping 146 matching lines @@
         resource_metadata_->GetSubDirectoriesRecursively(local_id,
                                                          &sub_directories);
         changed_dirs_.insert(sub_directories.begin(), sub_directories.end());
       }
     }
   }
 }
 
 }  // namespace internal
 }  // namespace drive