Fix inheritance in Reading List

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 "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)
-    : ModelTypeSyncBridge(change_processor_factory, syncer::READING_LIST),
+    : ReadingListModelStorage(change_processor_factory, syncer::READING_LIST),
       create_store_callback_(create_store_callback),
       pending_transaction_count_(0) {}
 
 ReadingListStore::~ReadingListStore() {
   DCHECK(pending_transaction_count_ == 0);
 }
 
 void ReadingListStore::SetReadingListModel(ReadingListModel* model,
                                            ReadingListStoreDelegate* delegate) {
   DCHECK(CalledOnValidThread());
@@ skipping 135 matching lines @@
   if (result != syncer::ModelTypeStore::Result::SUCCESS) {
     // TODO(crbug.com/664926): handle store creation error.
     return;
   }
   store_ = std::move(store);
   store_->ReadAllData(
       base::Bind(&ReadingListStore::OnDatabaseLoad, base::AsWeakPtr(this)));
   return;
 }
 
-syncer::ModelTypeSyncBridge* ReadingListStore::GetModelTypeSyncBridge() {
-  return this;
-}
-
 // Creates an object used to communicate changes in the sync metadata to the
 // model type store.
 std::unique_ptr<syncer::MetadataChangeList>
 ReadingListStore::CreateMetadataChangeList() {
   return syncer::ModelTypeStore::WriteBatch::CreateMetadataChangeList();
 }
 
 // Perform the initial merge between local and sync data. This should only be
 // called when a data type is first enabled to start syncing, and there is no
 // sync metadata. Best effort should be made to match local and sync data. The
@@ skipping 253 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;
 }