[sync] Handle local changes in AutocompleteSyncBridge

components/autofill/core/browser/webdata/autocomplete_sync_bridge.h

Index: components/autofill/core/browser/webdata/autocomplete_sync_bridge.h
diff --git a/components/autofill/core/browser/webdata/autocomplete_sync_bridge.h b/components/autofill/core/browser/webdata/autocomplete_sync_bridge.h
index 951ba9054b895f09f02d31d074b993a3c37c065a..f2e51275a2ba19703abe1c7766bda972aa300ddf 100644
--- a/components/autofill/core/browser/webdata/autocomplete_sync_bridge.h
+++ b/components/autofill/core/browser/webdata/autocomplete_sync_bridge.h
@@ -40,7 +40,7 @@ class AutocompleteSyncBridge : public base::SupportsUserData::Data,
   static AutocompleteSyncBridge* FromWebDataService(
       AutofillWebDataService* web_data_service);
 
-  // syncer::ModelTypeService implementation.
+  // syncer::ModelTypeSyncBridge implementation.
   std::unique_ptr<syncer::MetadataChangeList> CreateMetadataChangeList()
       override;
   syncer::ModelError MergeSyncData(
@@ -61,21 +61,21 @@ class AutocompleteSyncBridge : public base::SupportsUserData::Data,
   // where $name and $value are escaped.
   std::string GetStorageKey(const syncer::EntityData& entity_data) override;
 
+  // Provides a StartSyncFlare to the ModelTypeSyncBridge. See sync_start_util
+  // for more.
+  void InjectStartSyncFlare(
+      const syncer::ModelTypeSyncBridge::StartSyncFlare& flare);

[maxbogue, 2017/01/12 01:33:36]

Since we are inside a ModelTypeSyncBridge implementation, you can omit the
"syncer::ModelTypeSyncBridge::" from the type.

[Patrick Noland, 2017/01/13 23:31:52]

n/a now that flare is gone

+
   // AutofillWebDataServiceObserverOnDBThread implementation.
   void AutofillEntriesChanged(const AutofillChangeList& changes) override;
 
-  static AutofillEntry CreateAutofillEntry(
-      const sync_pb::AutofillSpecifics& autofill_specifics);
-
  private:
   // Returns the table associated with the |web_data_backend_|.
   AutofillTable* GetAutofillTable() const;
 
-  std::string GetStorageKeyFromAutofillEntry(
-      const autofill::AutofillEntry& entry);
+  std::string GetStorageKeyFromModel(const AutofillKey& key);

[maxbogue, 2017/01/12 01:33:35]

Make static and put below ActOnChanges. Might not apply if you do what Sky
suggests in the test file.

[Patrick Noland, 2017/01/13 23:31:52]

n/a now that unit tests don't use it

 
-  static std::string FormatStorageKey(const std::string& name,
-                                      const std::string& value);
+  void ActOnChanges(const AutofillChangeList& changes);

[maxbogue, 2017/01/12 01:33:36]

comment + also rename to something with "local" in the name? ActOnLocalChanges
or ApplyLocalChanges or somesuch.

 
   base::ThreadChecker thread_checker_;
 
@@ -85,6 +85,11 @@ class AutocompleteSyncBridge : public base::SupportsUserData::Data,
 
   ScopedObserver<AutofillWebDataBackend, AutocompleteSyncBridge>
       scoped_observer_;
+
+  syncer::ModelTypeSyncBridge::StartSyncFlare flare_;

[maxbogue, 2017/01/12 01:33:36]

omit "syncer::ModelTypeSyncBridge::"

[Patrick Noland, 2017/01/13 23:31:52]

n/a now that flare is gone

+
+  friend class AutocompleteSyncBridgeTest;

[maxbogue, 2017/01/12 01:33:36]

Friend things are always the first things under "private:". I'm not really sure
why but that seems conventional.

[skym, 2017/01/12 18:49:16]

I was hoping you'd be able to remove the friend class here. See
https://codereview.chromium.org/2582713003/ . It seems like we should avoid
friend classing anything for tests in components/autofill/*. vabr@ wrote:

Please do not friend the test. Tests should only depend on the public API,
making them depend on the internals makes them fragile. I added some concrete
suggestions below for how to keep your current test without the need to friend
it with the bridge.

[Patrick Noland, 2017/01/13 23:31:52]

n/a now that flare is gone

[Patrick Noland, 2017/01/13 23:31:52]

n/a now that flare is gone

+  FRIEND_TEST_ALL_PREFIXES(AutocompleteSyncBridgeTest, GetStorageKeyFromModel);

[maxbogue, 2017/01/12 01:33:36]

GetStorageKeyFromModel is not the name of a test case, so I don't believe this
line is doing anything...

[Patrick Noland, 2017/01/13 23:31:52]

n/a now that flare is gone

 };
 
 }  // namespace autofill