[USS] Remove intermediate structure during GetAllSyncMetadata

components/autofill/core/browser/webdata/autofill_table.cc

 // Copyright 2013 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/autofill/core/browser/webdata/autofill_table.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 #include <cmath>
@@ skipping 1682 matching lines @@
       "WHERE guid = ?"));
   s.BindString(0, guid);
 
   return s.Step();
 }
 
 bool AutofillTable::GetAllSyncMetadata(syncer::ModelType model_type,
                                        syncer::MetadataBatch* metadata_batch) {
   DCHECK_EQ(model_type, syncer::AUTOFILL)
       << "Only the AUTOFILL model type is supported";
-  syncer::EntityMetadataMap metadata_records;
-  if (GetAllSyncEntityMetadata(model_type, &metadata_records)) {
-    for (const auto& pair : metadata_records) {
-      // TODO(pnoland): Add batch transfer of metadata map.
-      metadata_batch->AddMetadata(pair.first, pair.second);
-    }
-  } else {
+  DCHECK(metadata_batch);
+  if (!GetAllSyncEntityMetadata(model_type, metadata_batch)) {
     return false;
   }
 
   sync_pb::ModelTypeState model_type_state;
   if (GetModelTypeState(model_type, &model_type_state)) {
     metadata_batch->SetModelTypeState(model_type_state);
   } else {
     return false;
   }
 
   return true;
 }
 
 bool AutofillTable::GetAllSyncEntityMetadata(
     syncer::ModelType model_type,
-    syncer::EntityMetadataMap* metadata_records) {
+    syncer::MetadataBatch* metadata_batch) {
   DCHECK_EQ(model_type, syncer::AUTOFILL)
       << "Only the AUTOFILL model type is supported";
+  DCHECK(metadata_batch);
 
   sql::Statement s(db_->GetUniqueStatement(
       "SELECT storage_key, value FROM autofill_sync_metadata"));
 
   while (s.Step()) {
     std::string storage_key = s.ColumnString(0);
     std::string serialized_metadata = s.ColumnString(1);
-    sync_pb::EntityMetadata metadata_record;
-    if (metadata_record.ParseFromString(serialized_metadata)) {
-      metadata_records->insert(std::make_pair(storage_key, metadata_record));
+    sync_pb::EntityMetadata entity_metadata;
+    if (entity_metadata.ParseFromString(serialized_metadata)) {
+      metadata_batch->AddMetadata(storage_key, entity_metadata);
     } else {
+      DLOG(WARNING) << "Failed to deserialize AUTOFILL model type "
+                       "sync_pb::EntityMetadata.";
       return false;
     }
   }
   return true;
 }
 
 bool AutofillTable::UpdateSyncMetadata(
     syncer::ModelType model_type,
     const std::string& storage_key,
     const sync_pb::EntityMetadata& metadata) {
@@ skipping 789 matching lines @@
   if (!db_->Execute("DROP TABLE masked_credit_cards") ||
       !db_->Execute("ALTER TABLE masked_credit_cards_temp "
                     "RENAME TO masked_credit_cards")) {
     return false;
   }
 
   return transaction.Commit();
 }
 
 }  // namespace autofill