Extension syncing: Introduce a NeedsSync pref

chrome/browser/extensions/sync_bundle.h

Index: chrome/browser/extensions/sync_bundle.h
diff --git a/chrome/browser/extensions/sync_bundle.h b/chrome/browser/extensions/sync_bundle.h
index 8ee58cf567b588fc1b24a8e23870bbbe6abcaa98..5ce98e109c5c6f9f568b13d3bab9d0c3c6392550 100644
--- a/chrome/browser/extensions/sync_bundle.h
+++ b/chrome/browser/extensions/sync_bundle.h
@@ -17,7 +17,6 @@ class ExtensionSyncService;
 
 namespace extensions {
 
-class Extension;
 class ExtensionSyncData;
 
 class SyncBundle {
@@ -40,11 +39,6 @@ class SyncBundle {
   // Checks if the extension with the given |id| is synced.
   bool HasExtensionId(const std::string& id) const;
 
-  // Whether the given extension should be included in the SyncDataList to be
-  // sent to the server. Returns false if there is pending data that should be
-  // used instead.
-  bool ShouldIncludeInLocalSyncDataList(const Extension& extension) const;
-
   // Handles the given list of local SyncDatas. This updates the set of synced
   // extensions as appropriate, and then pushes the corresponding SyncChanges
   // to the server.
@@ -57,12 +51,14 @@ class SyncBundle {
                         const syncer::SyncData& sync_data);
 
   // Pushes any sync changes to |extension| to the server.
-  void PushSyncChangeIfNeeded(const Extension& extension);
+  void PushSyncChange(const std::string& extension_id,

[not at google - send to devlin, 2015/07/15 20:27:57]

I see that some of my comments in the other CL were done in here anyway. Nice
:-)

+                      const syncer::SyncData& sync_data);
 
   // Applies the given SyncChange coming from the server.
   void ApplySyncChange(const syncer::SyncChange& sync_change);
 
-  // Checks if the extension with the given |id| is pending to be synced.
+  // Checks if there is pending sync data for the extension with the given |id|
+  // that should be sent to the server instead of the local state.
   bool HasPendingExtensionId(const std::string& id) const;
 
   // Adds a pending extension to be synced.