Apps&Extensions for Supervised Users: send permission request on outdated re-enables

chrome/browser/extensions/extension_sync_bundle.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/extension_sync_bundle.h"
 
 #include "base/location.h"
 #include "chrome/browser/extensions/extension_sync_service.h"
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 104 matching lines @@
     const std::string& id,
     const ExtensionSyncData& extension_sync_data) {
   pending_sync_data_[id] = extension_sync_data;
 }
 
 bool ExtensionSyncBundle::IsSyncing() const {
   return sync_processor_ != NULL;
 }
 
 void ExtensionSyncBundle::SyncChangeIfNeeded(const Extension& extension) {
+  // If there is a pending update for this extension, apply it first.
+  auto it = pending_sync_data_.find(extension.id());
+  if (it != pending_sync_data_.end())
+    ProcessSyncChange(it->second);

[Marc Treib, 2015/06/22 15:35:18]

It sucks that this code is duplicated in app_sync_bundle and
extension_sync_bundle - in fact, the two are almost identical % AppSyncData vs.
ExtensionSyncData. Maybe the base SyncData class should be a template...

+
   ExtensionSyncData extension_sync_data =
       extension_sync_service_->GetExtensionSyncData(extension);
 
   syncer::SyncChangeList sync_change_list(1, extension_sync_data.GetSyncChange(
       HasExtensionId(extension.id()) ?
       syncer::SyncChange::ACTION_UPDATE : syncer::SyncChange::ACTION_ADD));
   sync_processor_->ProcessSyncChanges(FROM_HERE, sync_change_list);
   MarkPendingExtensionSynced(extension.id());
 }
 
@@ skipping 35 matching lines @@
 void ExtensionSyncBundle::RemoveExtension(const std::string& id) {
   synced_extensions_.erase(id);
 }
 
 void ExtensionSyncBundle::MarkPendingExtensionSynced(const std::string& id) {
   pending_sync_data_.erase(id);
   synced_extensions_.insert(id);
 }
 
 }  // namespace extensions