Apps&Extensions for supervised users: Add Extension::WAS_INSTALLED_BY_CUSTODIAN flag and proto entry

chrome/browser/extensions/extension_sync_data.cc

Index: 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 aaf1244edf44c107948f1a6de1dab4ea3a3ee273..b401870995846f62ba41a56223e02b9d2f24ae09 100644
--- a/chrome/browser/extensions/extension_sync_data.cc
+++ b/chrome/browser/extensions/extension_sync_data.cc
@@ -19,14 +19,16 @@ ExtensionSyncData::ExtensionSyncData()
     : uninstalled_(false),
       enabled_(false),
       incognito_enabled_(false),
-      remote_install_(false) {
+      remote_install_(false),
+      installed_by_custodian_(false) {
 }
 
 ExtensionSyncData::ExtensionSyncData(const syncer::SyncData& sync_data)
     : uninstalled_(false),
       enabled_(false),
       incognito_enabled_(false),
-      remote_install_(false) {
+      remote_install_(false),
+      installed_by_custodian_(false) {
   PopulateFromSyncData(sync_data);
 }
 
@@ -35,7 +37,8 @@ ExtensionSyncData::ExtensionSyncData(const syncer::SyncChange& sync_change)
                    syncer::SyncChange::ACTION_DELETE),
       enabled_(false),
       incognito_enabled_(false),
-      remote_install_(false) {
+      remote_install_(false),
+      installed_by_custodian_(false) {
   PopulateFromSyncData(sync_change.sync_data());
 }
 
@@ -48,6 +51,7 @@ ExtensionSyncData::ExtensionSyncData(const Extension& extension,
       enabled_(enabled),
       incognito_enabled_(incognito_enabled),
       remote_install_(remote_install),
+      installed_by_custodian_(extension.was_installed_by_custodian()),
       version_(extension.from_bookmark() ? base::Version("0")
                                          : *extension.version()),
       update_url_(ManifestURL::GetUpdateURL(&extension)),
@@ -77,6 +81,7 @@ void ExtensionSyncData::PopulateExtensionSpecifics(
   specifics->set_enabled(enabled_);
   specifics->set_incognito_enabled(incognito_enabled_);
   specifics->set_remote_install(remote_install_);
+  specifics->set_installed_by_custodian(installed_by_custodian_);
   specifics->set_name(name_);
 }
 
@@ -102,6 +107,7 @@ void ExtensionSyncData::PopulateFromExtensionSpecifics(
   enabled_ = specifics.enabled();
   incognito_enabled_ = specifics.incognito_enabled();
   remote_install_ = specifics.remote_install();
+  installed_by_custodian_ = specifics.installed_by_custodian();
   name_ = specifics.name();
 }