drive: Stop comparing resource ID against kDriveGrandRootLocalId

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 38 matching lines @@
 
  private:
   int num_regular_files_;
   int num_hosted_documents_;
   int num_shared_with_me_entries_;
 };
 
 }  // namespace
 
 std::string DirectoryFetchInfo::ToString() const {
-  return ("resource_id: " + resource_id_ +
+  return ("local_id: " + local_id_ +
+          ", resource_id: " + resource_id_ +
           ", changestamp: " + base::Int64ToString(changestamp_));
 }
 
 ChangeList::ChangeList() {}
 
 ChangeList::ChangeList(const google_apis::ResourceList& resource_list)
     : largest_changestamp_(resource_list.largest_changestamp()) {
   resource_list.GetNextFeedURL(&next_url_);
 
   entries_.resize(resource_list.entries().size());
@@ skipping 280 matching lines @@
 }
 
 // static
 FileError ChangeListProcessor::RefreshDirectory(
     ResourceMetadata* resource_metadata,
     const DirectoryFetchInfo& directory_fetch_info,
     ScopedVector<ChangeList> change_lists,
     base::FilePath* out_file_path) {
   DCHECK(!directory_fetch_info.empty());
 
-  std::string directory_local_id;
-  FileError error = resource_metadata->GetIdByResourceId(
-      directory_fetch_info.resource_id(), &directory_local_id);
+  ResourceEntry directory;
+  FileError error = resource_metadata->GetResourceEntryById(
+      directory_fetch_info.local_id(), &directory);
   if (error != FILE_ERROR_OK)
     return error;
 
-  ResourceEntry directory;
-  error = resource_metadata->GetResourceEntryById(directory_local_id,
-                                                  &directory);
-  if (error != FILE_ERROR_OK)
-    return error;
-
   if (!directory.file_info().is_directory())
     return FILE_ERROR_NOT_A_DIRECTORY;
 
   for (size_t i = 0; i < change_lists.size(); ++i) {
     ChangeList* change_list = change_lists[i];
     std::vector<ResourceEntry>* entries = change_list->mutable_entries();
     for (size_t i = 0; i < entries->size(); ++i) {
       ResourceEntry* entry = &(*entries)[i];
       const std::string& parent_resource_id =
           change_list->parent_resource_ids()[i];
 
       // Skip if the parent resource ID does not match. This is needed to
       // handle entries with multiple parents. For such entries, the first
       // parent is picked and other parents are ignored, hence some entries may
       // have a parent resource ID which does not match the target directory's.
       if (parent_resource_id != directory_fetch_info.resource_id()) {
         DVLOG(1) << "Wrong-parent entry rejected: " << entry->resource_id();
         continue;
       }
 
-      entry->set_parent_local_id(directory_local_id);
+      entry->set_parent_local_id(directory_fetch_info.local_id());
 
       std::string local_id;
       error = resource_metadata->GetIdByResourceId(entry->resource_id(),
                                                    &local_id);
       if (error == FILE_ERROR_OK) {
         entry->set_local_id(local_id);
         error = resource_metadata->RefreshEntry(*entry);
       }
 
       if (error == FILE_ERROR_NOT_FOUND) {  // If refreshing fails, try adding.
         std::string local_id;
         entry->clear_local_id();
         error = resource_metadata->AddEntry(*entry, &local_id);
       }
 
       if (error != FILE_ERROR_OK)
         return error;
     }
   }
 
   directory.mutable_directory_specific_info()->set_changestamp(
       directory_fetch_info.changestamp());
   error = resource_metadata->RefreshEntry(directory);
   if (error != FILE_ERROR_OK)
     return error;
 
-  *out_file_path = resource_metadata->GetFilePath(directory_local_id);
+  *out_file_path = resource_metadata->GetFilePath(
+      directory_fetch_info.local_id());
   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()) {
@@ skipping 32 matching lines @@
         resource_metadata_->GetSubDirectoriesRecursively(local_id,
                                                          &sub_directories);
         changed_dirs_.insert(sub_directories.begin(), sub_directories.end());
       }
     }
   }
 }
 
 }  // namespace internal
 }  // namespace drive