[Sync] Make all ModelTypeStore write methods go through WriteBatch.

components/sync/device_info/device_info_sync_bridge.cc

 // Copyright 2015 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/sync/device_info/device_info_sync_bridge.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 #include <set>
@@ skipping 226 matching lines @@
   // Allow deletion of metadata to happen before the deletion of data below. If
   // we crash after removing metadata but not regular data, then merge can
   // handle pairing everything back up.
   ModelTypeSyncBridge::DisableSync();
 
   // Remove all local data, if sync is being disabled, the user has expressed
   // their desire to not have knowledge about other devices.
   if (!all_data_.empty()) {
     std::unique_ptr<WriteBatch> batch = store_->CreateWriteBatch();
     for (const auto& kv : all_data_) {
-      store_->DeleteData(batch.get(), kv.first);
+      batch->DeleteData(kv.first);
     }
     store_->CommitWriteBatch(
         std::move(batch),
         base::Bind(&DeviceInfoSyncBridge::OnCommit, base::AsWeakPtr(this)));
 
     all_data_.clear();
     NotifyObservers();
   }
 }
 
@@ skipping 34 matching lines @@
 
 void DeviceInfoSyncBridge::NotifyObservers() {
   for (auto& observer : observers_)
     observer.OnDeviceInfoChange();
 }
 
 void DeviceInfoSyncBridge::StoreSpecifics(
     std::unique_ptr<DeviceInfoSpecifics> specifics,
     WriteBatch* batch) {
   const std::string guid = specifics->cache_guid();
-  store_->WriteData(batch, guid, specifics->SerializeAsString());
+  batch->WriteData(guid, specifics->SerializeAsString());
   all_data_[guid] = std::move(specifics);
 }
 
 bool DeviceInfoSyncBridge::DeleteSpecifics(const std::string& guid,
                                            WriteBatch* batch) {
   ClientIdToSpecifics::const_iterator iter = all_data_.find(guid);
   if (iter != all_data_.end()) {
-    store_->DeleteData(batch, guid);
+    batch->DeleteData(guid);
     all_data_.erase(iter);
     return true;
   } else {
     return false;
   }
 }
 
 void DeviceInfoSyncBridge::OnProviderInitialized() {
   // Now that the provider has initialized, remove the subscription. The bridge
   // should only need to give the processor metadata upon initialization. If
@@ skipping 134 matching lines @@
 }
 
 void DeviceInfoSyncBridge::ReportStartupErrorToSync(const std::string& msg) {
   // TODO(skym): Shouldn't need to log this here, reporting should always log.
   LOG(WARNING) << msg;
   change_processor()->OnMetadataLoaded(
       change_processor()->CreateAndUploadError(FROM_HERE, msg), nullptr);
 }
 
 }  // namespace syncer