[Sync] Renamed OnMetadataLoaded to ModelReadyToSync.

components/reading_list/ios/reading_list_store.cc

 // Copyright 2016 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/reading_list/ios/reading_list_store.h"
 
+#include <set>
+#include <utility>
+
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "components/reading_list/ios/proto/reading_list.pb.h"
 #include "components/reading_list/ios/reading_list_model_impl.h"
 #include "components/sync/model/entity_change.h"
 #include "components/sync/model/metadata_batch.h"
 #include "components/sync/model/metadata_change_list.h"
 #include "components/sync/model/model_type_change_processor.h"
 #include "components/sync/model/mutable_data_batch.h"
 #include "components/sync/model_impl/accumulating_metadata_change_list.h"
 #include "components/sync/protocol/model_type_state.pb.h"
 
 ReadingListStore::ReadingListStore(
     StoreFactoryFunction create_store_callback,
     const ChangeProcessorFactory& change_processor_factory)
     : ReadingListModelStorage(change_processor_factory, syncer::READING_LIST),
       create_store_callback_(create_store_callback),
       pending_transaction_count_(0) {}
 
 ReadingListStore::~ReadingListStore() {
-  DCHECK(pending_transaction_count_ == 0);
+  DCHECK_EQ(0, pending_transaction_count_);
 }
 
 void ReadingListStore::SetReadingListModel(ReadingListModel* model,
                                            ReadingListStoreDelegate* delegate) {
   DCHECK(CalledOnValidThread());
   model_ = model;
   delegate_ = delegate;
   create_store_callback_.Run(
       base::Bind(&ReadingListStore::OnStoreCreated, base::AsWeakPtr(this)));
 }
@@ skipping 110 matching lines @@
       base::Bind(&ReadingListStore::OnReadAllMetadata, base::AsWeakPtr(this)));
 }
 
 void ReadingListStore::OnReadAllMetadata(
     base::Optional<syncer::ModelError> error,
     std::unique_ptr<syncer::MetadataBatch> metadata_batch) {
   DCHECK(CalledOnValidThread());
   if (error) {
     change_processor()->ReportError(FROM_HERE, "Failed to read metadata.");
   } else {
-    change_processor()->OnMetadataLoaded(std::move(metadata_batch));
+    change_processor()->ModelReadyToSync(std::move(metadata_batch));
   }
 }
 
 void ReadingListStore::OnDatabaseSave(syncer::ModelTypeStore::Result result) {
   return;
 }
 
 void ReadingListStore::OnStoreCreated(
     syncer::ModelTypeStore::Result result,
     std::unique_ptr<syncer::ModelTypeStore> store) {
@@ skipping 75 matching lines @@
           merged_entry->AsReadingListSpecifics();
       DCHECK(CompareEntriesForSync(specifics, *entry_sync_pb));
       auto entity_data = base::MakeUnique<syncer::EntityData>();
       *(entity_data->specifics.mutable_reading_list()) = *entry_sync_pb;
       entity_data->non_unique_name = entry_sync_pb->entry_id();
 
       // TODO(crbug.com/666232): Investigate if there is a risk of sync
       // ping-pong.
       change_processor()->Put(entry_sync_pb->entry_id(), std::move(entity_data),
                               metadata_change_list.get());
-
     }
   }
 
   // Commit local only entries to server.
   for (const auto& url : model_->Keys()) {
     const ReadingListEntry* entry = model_->GetEntryByURL(url);
     if (synced_entries.count(url.spec())) {
       // Entry already exists and has been merged above.
       continue;
     }
@@ skipping 68 matching lines @@
         DCHECK(CompareEntriesForSync(specifics, *entry_sync_pb));
         auto entity_data = base::MakeUnique<syncer::EntityData>();
         *(entity_data->specifics.mutable_reading_list()) = *entry_sync_pb;
         entity_data->non_unique_name = entry_sync_pb->entry_id();
 
         // TODO(crbug.com/666232): Investigate if there is a risk of sync
         // ping-pong.
         change_processor()->Put(entry_sync_pb->entry_id(),
                                 std::move(entity_data),
                                 metadata_change_list.get());
-
       }
     }
   }
 
   batch_->TransferMetadataChanges(std::move(metadata_change_list));
   return {};
 }
 
 void ReadingListStore::GetData(StorageKeyList storage_keys,
                                DataCallback callback) {
@@ skipping 96 matching lines @@
     if (rhs.first_read_time_us() == 0 && lhs.first_read_time_us() != 0) {
       return false;
     }
     if (rhs.first_read_time_us() > lhs.first_read_time_us() &&
         lhs.first_read_time_us() != 0) {
       return false;
     }
   }
   return true;
 }