commit d1aa852e6df52eaca4da775a3c40b3c1c8431008
author rdevlin.cronin <rdevlin.cronin@chromium.org> Fri Feb 13 00:25:57 2015
committer Commit bot <commit-bot@chromium.org> Fri Feb 13 00:26:33 2015
tree 312f0c8f255ad6e0fe56253b3319e574fc20a801
parent 2eaed24e86bdb6fb9bbe5d63d88a4692402e31aa

[Extensions] Sync the 'allowed scripting on all urls' preference

Sync the flag for whether or not an extension is allowed to script on all urls,
independent of the flag to enable the feature. This (eventually) allows people
to install extensions on a machine with the flag without the scary warning
about what will happen if it's synced.

BUG=452756

Review URL: https://codereview.chromium.org/907533004

Cr-Commit-Position: refs/heads/master@{#316100}

chrome/browser/extensions/extension_sync_data.cc

diff --git a/chrome/browser/extensions/extension_sync_data.cc b/chrome/browser/extensions/extension_sync_data.cc
index ee55d1a..007887d 100644
--- a/chrome/browser/extensions/extension_sync_data.cc
+++ b/chrome/browser/extensions/extension_sync_data.cc
@@ -21,6 +21,7 @@
       enabled_(false),
       incognito_enabled_(false),
       remote_install_(false),
+      all_urls_enabled_(BOOLEAN_UNSET),
       installed_by_custodian_(false) {
 }
 
@@ -29,6 +30,7 @@
       enabled_(false),
       incognito_enabled_(false),
       remote_install_(false),
+      all_urls_enabled_(BOOLEAN_UNSET),
       installed_by_custodian_(false) {
   PopulateFromSyncData(sync_data);
 }
@@ -39,6 +41,7 @@
       enabled_(false),
       incognito_enabled_(false),
       remote_install_(false),
+      all_urls_enabled_(BOOLEAN_UNSET),
       installed_by_custodian_(false) {
   PopulateFromSyncData(sync_change.sync_data());
 }
@@ -46,12 +49,14 @@
 ExtensionSyncData::ExtensionSyncData(const Extension& extension,
                                      bool enabled,
                                      bool incognito_enabled,
-                                     bool remote_install)
+                                     bool remote_install,
+                                     OptionalBoolean all_urls_enabled)
     : id_(extension.id()),
       uninstalled_(false),
       enabled_(enabled),
       incognito_enabled_(incognito_enabled),
       remote_install_(remote_install),
+      all_urls_enabled_(all_urls_enabled),
       installed_by_custodian_(extension.was_installed_by_custodian()),
       version_(extension.from_bookmark() ? base::Version("0")
                                          : *extension.version()),
@@ -82,6 +87,8 @@
   specifics->set_enabled(enabled_);
   specifics->set_incognito_enabled(incognito_enabled_);
   specifics->set_remote_install(remote_install_);
+  if (all_urls_enabled_ != BOOLEAN_UNSET)
+    specifics->set_all_urls_enabled(all_urls_enabled_ == BOOLEAN_TRUE);
   specifics->set_installed_by_custodian(installed_by_custodian_);
   specifics->set_name(name_);
 }
@@ -107,6 +114,14 @@
   version_ = specifics_version;
   enabled_ = specifics.enabled();
   incognito_enabled_ = specifics.incognito_enabled();
+  if (specifics.has_all_urls_enabled()) {
+    all_urls_enabled_ =
+        specifics.all_urls_enabled() ? BOOLEAN_TRUE : BOOLEAN_FALSE;
+  } else {
+    // Set this explicitly (even though it's the default) on the offchance
+    // that someone is re-using an ExtensionSyncData object.
+    all_urls_enabled_ = BOOLEAN_UNSET;
+  }
   remote_install_ = specifics.remote_install();
   installed_by_custodian_ = specifics.installed_by_custodian();
   name_ = specifics.name();