Create withheld permissions

chrome/browser/extensions/permissions_updater.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/permissions_updater.h"
 
 #include "base/json/json_writer.h"
 #include "base/memory/ref_counted.h"
 #include "base/values.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ skipping 94 matching lines @@
 
   // Make sure the active permissions contain no more than optional + default.
   scoped_refptr<PermissionSet> adjusted_active =
       PermissionSet::CreateIntersection(total_permissions, active_permissions);
 
   // Make sure the active permissions contain the default permissions.
   adjusted_active = PermissionSet::CreateUnion(
       PermissionsParser::GetRequiredPermissions(extension),
       adjusted_active);
 
-  SetActivePermissions(extension, adjusted_active);
+  extension->permissions_data()->InitializePermissions(adjusted_active,
+                                                       extension);
+  // We record the active permissions after PermissionsData finishes
+  // initializing, so that we properly record any withheld permissions.
+  // TODO(rdevlin.cronin) This is badly factored. We should do all the
+  // initialization in one place - either here, in PermissionsData, or in some
+  // other object.
+  ExtensionPrefs::Get(browser_context_)->SetActivePermissions(
+      extension->id(), extension->permissions_data()->active_permissions());
 }
 
 void PermissionsUpdater::SetActivePermissions(
     const Extension* extension, const PermissionSet* permissions) {
   ExtensionPrefs::Get(browser_context_)->SetActivePermissions(
       extension->id(), permissions);
-  extension->permissions_data()->SetActivePermissions(permissions);
+  extension->permissions_data()->SetPermissions(
+      permissions, extension->permissions_data()->withheld_permissions());
 }
 
 void PermissionsUpdater::DispatchEvent(
     const std::string& extension_id,
     const char* event_name,
     const PermissionSet* changed_permissions) {
   EventRouter* event_router = EventRouter::Get(browser_context_);
   if (!event_router)
     return;
 
@@ skipping 28 matching lines @@
   // Notify other APIs or interested parties.
   UpdatedExtensionPermissionsInfo info = UpdatedExtensionPermissionsInfo(
       extension, changed, reason);
   Profile* profile = Profile::FromBrowserContext(browser_context_);
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_EXTENSION_PERMISSIONS_UPDATED,
       content::Source<Profile>(profile),
       content::Details<UpdatedExtensionPermissionsInfo>(&info));
 
   ExtensionMsg_UpdatePermissions_Params params;
-  params.reason_id = static_cast<int>(reason);
   params.extension_id = extension->id();
-  params.apis = changed->apis();
-  params.manifest_permissions = changed->manifest_permissions();
-  params.explicit_hosts = changed->explicit_hosts();
-  params.scriptable_hosts = changed->scriptable_hosts();
+  params.active_permissions = ExtensionMsg_PermissionSetStruct(
+      extension->permissions_data()->active_permissions());
+  params.withheld_permissions = ExtensionMsg_PermissionSetStruct(
+      extension->permissions_data()->withheld_permissions());
 
   // Send the new permissions to the renderers.
   for (RenderProcessHost::iterator i(RenderProcessHost::AllHostsIterator());
        !i.IsAtEnd(); i.Advance()) {
     RenderProcessHost* host = i.GetCurrentValue();
     if (profile->IsSameProfile(
             Profile::FromBrowserContext(host->GetBrowserContext()))) {
       host->Send(new ExtensionMsg_UpdatePermissions(params));
     }
   }
 
   // Trigger the onAdded and onRemoved events in the extension.
   DispatchEvent(extension->id(), event_name, changed);
 }
 
 }  // namespace extensions