Move UpdateActivePermissions from ExtensionService to PermissionsUpdater

chrome/browser/extensions/permissions_updater.h

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_PERMISSIONS_UPDATER_H__
 #define CHROME_BROWSER_EXTENSIONS_PERMISSIONS_UPDATER_H__
 
 #include <string>
 
 #include "base/memory/ref_counted.h"
 
-class Profile;
-
 namespace base {
 class DictionaryValue;
 }
 
+namespace content {
+class BrowserContext;
+}
+
 namespace extensions {
 
 class Extension;
 class ExtensionPrefs;
 class PermissionSet;
 
 // Updates an Extension's active and granted permissions in persistent storage
 // and notifies interested parties of the changes.
 class PermissionsUpdater {
  public:
-  explicit PermissionsUpdater(Profile* profile);
+  explicit PermissionsUpdater(content::BrowserContext* browser_context);
   ~PermissionsUpdater();
 
   // Adds the set of |permissions| to the |extension|'s active permission set
   // and sends the relevant messages and notifications. This method assumes the
   // user has already been prompted, if necessary, for the extra permissions.
   void AddPermissions(const Extension* extension,
                       const PermissionSet* permissions);
 
   // Removes the set of |permissions| from the |extension|'s active permission
   // set and sends the relevant messages and notifications.
   void RemovePermissions(const Extension* extension,
                          const PermissionSet* permissions);
 
   // Adds all permissions in the |extension|'s active permissions to its
   // granted permission set.
   void GrantActivePermissions(const Extension* extension);
 
-  // Sets the |extension|'s active permissions to |permissions|.
-  void UpdateActivePermissions(const Extension* extension,
-                               const PermissionSet* permissions);
+  // Updates the |extension|'s active permission set to include only permissions
+  // currently requested by the extension and all the permissions required by
+  // the extension.
+  void UpdateActivePermissions(const Extension* extension);

[Yoyo Zhou, 2014/06/20 16:13:39]

This only gets called in the flow from AddPermissions. I feel
InitializeActivePermissions would be a better name.

[Devlin, 2014/06/20 17:05:29]

Done.

(I assume you meant "called in the flow from AddExtension".)

 
  private:
   enum EventType {
     ADDED,
     REMOVED,
   };
 
+  // Sets the |extension|'s active permissions to |permissions| and records the
+  // change in the prefs.
+  void SetActivePermissions(const Extension* extension,
+                            const PermissionSet* permisssions);
+
   // Dispatches specified event to the extension.
   void DispatchEvent(const std::string& extension_id,
                      const char* event_name,
                      const PermissionSet* changed_permissions);
 
   // Issues the relevant events, messages and notifications when the
   // |extension|'s permissions have |changed| (|changed| is the delta).
   // Specifically, this sends the EXTENSION_PERMISSIONS_UPDATED notification,
   // the ExtensionMsg_UpdatePermissions IPC message, and fires the
   // onAdded/onRemoved events in the extension.
   void NotifyPermissionsUpdated(EventType event_type,
                                 const Extension* extension,
                                 const PermissionSet* changed);
 
-  // Gets the ExtensionPrefs for the associated profile.
-  ExtensionPrefs* GetExtensionPrefs();
-
-  Profile* profile_;
+  // The associated BrowserContext.
+  content::BrowserContext* browser_context_;
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_PERMISSIONS_UPDATER_H__