Added Instant preference syncing and tests.

chrome/browser/extensions/extension_sync_data.h

Index: chrome/browser/extensions/extension_sync_data.h
diff --git a/chrome/browser/extensions/extension_sync_data.h b/chrome/browser/extensions/extension_sync_data.h
index b55006000f3f39412b81854f5955ecaa7bbde069..d10da70512fd830e689702288b909dbba93ec0f3 100644
--- a/chrome/browser/extensions/extension_sync_data.h
+++ b/chrome/browser/extensions/extension_sync_data.h
@@ -16,7 +16,10 @@
 
 class ExtensionService;
 class SyncData;
-namespace sync_pb { class ExtensionSpecifics; }
+namespace sync_pb {
+class AppSpecifics;
+class ExtensionSpecifics;
+}
 
 // A class that encapsulates the synced properties of an Extension.
 class ExtensionSyncData {
@@ -26,11 +29,15 @@ class ExtensionSyncData {
   explicit ExtensionSyncData(const SyncChange& sync_change);
   ExtensionSyncData(const Extension& extension,
                     bool enabled,
-                    bool incognito_enabled);
+                    bool incognito_enabled,
+                    int32 app_launch_index,
+                    int32 page_index);
   ~ExtensionSyncData();
 
   // Convert an ExtensionSyncData back out to a sync structure.
-  void PopulateSyncSpecifics(sync_pb::ExtensionSpecifics* specifics) const;
+  void PopulateExtensionSyncSpecifics(
+      sync_pb::ExtensionSpecifics* specifics) const;
+  void PopulateAppSyncSpecifics(sync_pb::AppSpecifics* specifics) const;
   SyncData GetSyncData() const;
   SyncChange GetSyncChange(SyncChange::SyncChangeType change_type) const;
 
@@ -43,6 +50,8 @@ class ExtensionSyncData {
   bool enabled() const { return enabled_; }
   bool incognito_enabled() const { return incognito_enabled_; }
   Extension::SyncType type() const { return type_; }
+  int32 app_launch_index() const { return app_launch_index_; }
+  int32 page_index() const {return page_index_; }
 
   // Version-dependent properties (i.e., should be used only when the
   // version of the currenty-installed extension matches |version|).
@@ -54,6 +63,8 @@ class ExtensionSyncData {
  private:
   void PopulateFromExtensionSpecifics(
       const sync_pb::ExtensionSpecifics& specifics);
+  void PopulateFromAppSpecifics(
+      const sync_pb::AppSpecifics& specifics);
   void PopulateFromSyncData(const SyncData& sync_data);
 
   std::string id_;
@@ -64,6 +75,8 @@ class ExtensionSyncData {
   Version version_;
   GURL update_url_;
   std::string name_;
+  int32 app_launch_index_;
+  int32 page_index_;
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_SYNC_DATA_H_