Process TeamDrive change in change list.

components/drive/chromeos/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 "components/drive/chromeos/change_list_processor.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <utility>
@@ skipping 63 matching lines @@
 ChangeList::ChangeList(const google_apis::ChangeList& change_list)
     : next_url_(change_list.next_link()),
       largest_changestamp_(change_list.largest_change_id()) {
   const std::vector<std::unique_ptr<google_apis::ChangeResource>>& items =
       change_list.items();
   entries_.resize(items.size());
   parent_resource_ids_.resize(items.size());
   size_t entries_index = 0;
   for (size_t i = 0; i < items.size(); ++i) {
     if (ConvertChangeResourceToResourceEntry(
-            *items[i],
-            &entries_[entries_index],
+            *items[i], &entries_[entries_index],
             &parent_resource_ids_[entries_index])) {
       ++entries_index;
     }
   }
   entries_.resize(entries_index);
   parent_resource_ids_.resize(entries_index);
 }
 
 ChangeList::ChangeList(const google_apis::FileList& file_list)
     : next_url_(file_list.next_link()),
@@ skipping 205 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).
+      // TODO(yamaguchi): Apply this defensive logic to root directories of
+      // every Team Drive as well.
       ResourceEntryMap::iterator it = entries[i];
       if (it->first != root.resource_id()) {
         FileError error = ApplyEntry(it->second);
         if (error != FILE_ERROR_OK) {
           LOG(ERROR) << "ApplyEntry failed: " << FileErrorToString(error)
                      << ", title = " << it->second.title();
           return error;
         }
       }
       entry_map_.erase(it);
@@ skipping 20 matching lines @@
                  << ", resource_id = " << deleted_resource_ids[i];
       return error;
     }
   }
 
   return FILE_ERROR_OK;
 }
 
 FileError ChangeListProcessor::ApplyEntry(const ResourceEntry& entry) {
   DCHECK(!entry.deleted());
+  DCHECK(!entry.resource_id().empty());
   DCHECK(parent_resource_id_map_.count(entry.resource_id()));
-  const std::string& parent_resource_id =
-      parent_resource_id_map_[entry.resource_id()];
 
   ResourceEntry new_entry(entry);
-  FileError error = SetParentLocalIdOfEntry(resource_metadata_, &new_entry,
-                                            parent_resource_id);
-  if (error != FILE_ERROR_OK)
-    return error;
+  // When |entry| is a root directory of a Team Drive, the parent directory of
+  // it is "/team_drives", which doesn't have resource ID.
+  if (entry.parent_local_id().compare(util::kDriveTeamDrivesDirLocalId) != 0) {

[hashimoto, 2017/04/11 07:55:14]

entry.parent_local_id() != util::kDriveTeamDrivesDirLocalId

[yamaguchi, 2017/04/11 10:11:41]

Done.

+    const std::string& parent_resource_id =
+        parent_resource_id_map_[entry.resource_id()];
+    FileError error = SetParentLocalIdOfEntry(resource_metadata_, &new_entry,
+                                              parent_resource_id);
+    if (error != FILE_ERROR_OK)
+      return error;
+  }
 
   // Lookup the entry.
   std::string local_id;
-  error = resource_metadata_->GetIdByResourceId(entry.resource_id(), &local_id);
+  FileError error =
+      resource_metadata_->GetIdByResourceId(entry.resource_id(), &local_id);
 
   ResourceEntry existing_entry;
   if (error == FILE_ERROR_OK)
     error = resource_metadata_->GetResourceEntryById(local_id, &existing_entry);
 
   switch (error) {
     case FILE_ERROR_OK:
       if (ShouldApplyChange(existing_entry, new_entry)) {
         // Entry exists and needs to be refreshed.
         new_entry.set_local_id(local_id);
@@ skipping 85 matching lines @@
   }
   return FILE_ERROR_OK;
 }
 
 // static
 FileError ChangeListProcessor::SetParentLocalIdOfEntry(
     ResourceMetadata* resource_metadata,
     ResourceEntry* entry,
     const std::string& parent_resource_id) {
   std::string parent_local_id;
   if (parent_resource_id.empty()) {

[hashimoto, 2017/04/11 07:55:14]

Please merge the team drive handling logic to this function which handles
entries with empty parent_resource_id.

[yamaguchi, 2017/04/11 10:11:41]

Done.

     // Entries without parents should go under "other" directory.
     parent_local_id = util::kDriveOtherDirLocalId;
   } else {
     FileError error = resource_metadata->GetIdByResourceId(
         parent_resource_id, &parent_local_id);
     if (error != FILE_ERROR_OK)
       return error;
   }
   entry->set_parent_local_id(parent_local_id);
   return FILE_ERROR_OK;
@@ skipping 11 matching lines @@
   if (!file_path.empty()) {
     FileChange::ChangeType type = entry.deleted()
                                       ? FileChange::CHANGE_TYPE_DELETE
                                       : FileChange::CHANGE_TYPE_ADD_OR_UPDATE;
     changed_files_->Update(file_path, entry, type);
   }
 }
 
 }  // namespace internal
 }  // namespace drive