[Sync] Use a proto to generate AutofillSyncStorageKey's storage keys.

components/autofill/core/browser/webdata/autocomplete_sync_bridge.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/autofill/core/browser/webdata/autocomplete_sync_bridge.h"
 
 #include <unordered_set>
+#include <utility>
+#include <vector>
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
+#include "components/autofill/core/browser/proto/autofill_sync.pb.h"
 #include "components/autofill/core/browser/webdata/autofill_metadata_change_list.h"
 #include "components/autofill/core/browser/webdata/autofill_table.h"
 #include "components/autofill/core/browser/webdata/autofill_webdata_backend.h"
 #include "components/autofill/core/browser/webdata/autofill_webdata_service.h"
 #include "components/sync/model/entity_data.h"
 #include "components/sync/model/model_type_change_processor.h"
 #include "components/sync/model/mutable_data_batch.h"
 #include "components/sync/model/sync_error.h"
 #include "net/base/escape.h"
 
+namespace autofill {
+
 namespace {
 
 const char kAutocompleteEntryNamespaceTag[] = "autofill_entry|";
 
 void* UserDataKey() {
   // Use the address of a static that COMDAT folding won't ever collide
   // with something else.
   static int user_data_key = 0;
   return reinterpret_cast<void*>(&user_data_key);
 }
 
 std::unique_ptr<syncer::EntityData> CreateEntityData(
-    const autofill::AutofillEntry& entry) {
+    const AutofillEntry& entry) {
   auto entity_data = base::MakeUnique<syncer::EntityData>();
   entity_data->non_unique_name = base::UTF16ToUTF8(entry.key().name());
   sync_pb::AutofillSpecifics* autofill =
       entity_data->specifics.mutable_autofill();
   autofill->set_name(base::UTF16ToUTF8(entry.key().name()));
   autofill->set_value(base::UTF16ToUTF8(entry.key().value()));
   autofill->add_usage_timestamp(entry.date_created().ToInternalValue());
   if (entry.date_created() != entry.date_last_used())
     autofill->add_usage_timestamp(entry.date_last_used().ToInternalValue());
   return entity_data;
 }
 
+std::string GetClientTagFromStrings(const std::string& name,
+                                    const std::string& value) {
+  std::string prefix(kAutocompleteEntryNamespaceTag);
+  return prefix + net::EscapePath(name) + "|" + net::EscapePath(value);
+}
+
+std::string GetStorageKeyFromStrings(const std::string& name,
+                                     const std::string& value) {
+  AutofillSyncStorageKey proto;
+  proto.set_name(name);
+  proto.set_value(value);
+  return proto.SerializeAsString();
+}
+
+std::string GetStorageKeyFromModel(const AutofillKey& key) {
+  return GetStorageKeyFromStrings(base::UTF16ToUTF8(key.name()),
+                                  base::UTF16ToUTF8(key.value()));
+}
+
 }  // namespace
 
-namespace autofill {
-
 // static
 void AutocompleteSyncBridge::CreateForWebDataServiceAndBackend(
     AutofillWebDataService* web_data_service,
     AutofillWebDataBackend* web_data_backend) {
   web_data_service->GetDBUserData()->SetUserData(
       UserDataKey(),
       new AutocompleteSyncBridge(
           web_data_backend,
           base::Bind(&syncer::ModelTypeChangeProcessor::Create)));
 }
@@ skipping 49 matching lines @@
   DCHECK(thread_checker_.CalledOnValidThread());
   std::unordered_set<std::string> keys_set;
   for (const auto& key : storage_keys) {
     keys_set.insert(key);
   }
 
   auto batch = base::MakeUnique<syncer::MutableDataBatch>();
   std::vector<AutofillEntry> entries;
   GetAutofillTable()->GetAllAutofillEntries(&entries);
   for (const AutofillEntry& entry : entries) {
-    std::string key = GetStorageKeyFromAutofillEntry(entry);
+    std::string key = GetStorageKeyFromModel(entry.key());
     if (keys_set.find(key) != keys_set.end()) {
       batch->Put(key, CreateEntityData(entry));
     }
   }
   callback.Run(syncer::SyncError(), std::move(batch));
 }
 
 void AutocompleteSyncBridge::GetAllData(DataCallback callback) {
   DCHECK(thread_checker_.CalledOnValidThread());
   auto batch = base::MakeUnique<syncer::MutableDataBatch>();
   std::vector<AutofillEntry> entries;
   GetAutofillTable()->GetAllAutofillEntries(&entries);
   for (const AutofillEntry& entry : entries) {
-    batch->Put(GetStorageKeyFromAutofillEntry(entry), CreateEntityData(entry));
+    batch->Put(GetStorageKeyFromModel(entry.key()), CreateEntityData(entry));
   }
   callback.Run(syncer::SyncError(), std::move(batch));
 }
 
 std::string AutocompleteSyncBridge::GetClientTag(
     const syncer::EntityData& entity_data) {
   DCHECK(entity_data.specifics.has_autofill());
-
   const sync_pb::AutofillSpecifics specifics = entity_data.specifics.autofill();
-  std::string storage_key =
-      FormatStorageKey(specifics.name(), specifics.value());
-  std::string prefix(kAutocompleteEntryNamespaceTag);
-  return prefix + storage_key;
+  return GetClientTagFromStrings(specifics.name(), specifics.value());

[maxbogue, 2017/01/04 01:42:46]

GetClientTagFromStrings doesn't seem like it'll ever be used anywhere but here,
so I'd just leave it inline probably.

[skym, 2017/01/05 01:31:51]

Done.

 }
 
 std::string AutocompleteSyncBridge::GetStorageKey(
     const syncer::EntityData& entity_data) {
+  DCHECK(entity_data.specifics.has_autofill());
   const sync_pb::AutofillSpecifics specifics = entity_data.specifics.autofill();
-  return FormatStorageKey(specifics.name(), specifics.value());
+  return GetStorageKeyFromStrings(specifics.name(), specifics.value());
 }
 
 // AutofillWebDataServiceObserverOnDBThread implementation.
 void AutocompleteSyncBridge::AutofillEntriesChanged(
     const AutofillChangeList& changes) {
   DCHECK(thread_checker_.CalledOnValidThread());
 }
 
 // static
 AutofillEntry AutocompleteSyncBridge::CreateAutofillEntry(
     const sync_pb::AutofillSpecifics& autofill_specifics) {
   AutofillKey key(base::UTF8ToUTF16(autofill_specifics.name()),
                   base::UTF8ToUTF16(autofill_specifics.value()));
   base::Time date_created, date_last_used;
   const google::protobuf::RepeatedField<int64_t>& timestamps =
       autofill_specifics.usage_timestamp();
   if (!timestamps.empty()) {
     date_created = base::Time::FromInternalValue(*timestamps.begin());
     date_last_used = base::Time::FromInternalValue(*timestamps.rbegin());
   }
   return AutofillEntry(key, date_created, date_last_used);
 }
 
 AutofillTable* AutocompleteSyncBridge::GetAutofillTable() const {
   return AutofillTable::FromWebDatabase(web_data_backend_->GetDatabase());
 }
 
-std::string AutocompleteSyncBridge::GetStorageKeyFromAutofillEntry(
-    const autofill::AutofillEntry& entry) {
-  return FormatStorageKey(base::UTF16ToUTF8(entry.key().name()),
-                          base::UTF16ToUTF8(entry.key().value()));
-}
-
-// static
-std::string AutocompleteSyncBridge::FormatStorageKey(const std::string& name,
-                                                     const std::string& value) {
-  return net::EscapePath(name) + "|" + net::EscapePath(value);
-}
-
 }  // namespace autofill