Refactor PermissionsData pt1

chrome/browser/extensions/active_tab_permission_granter.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/active_tab_permission_granter.h"
 
 #include "chrome/browser/extensions/active_script_controller.h"
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
@@ skipping 31 matching lines @@
 
   APIPermissionSet new_apis;
   URLPatternSet new_hosts;
 
   // If the extension requires action for script execution, we grant it
   // active tab-style permissions, even if it doesn't have the activeTab
   // permission in the manifest.
   // We don't take tab id into account, because we want to know if the extension
   // should require active tab in general (not for the current tab).
   bool requires_action_for_script_execution =
-      PermissionsData::RequiresActionForScriptExecution(
-          extension,
-          -1,  // No tab id.
-          GURL::EmptyGURL());
+      PermissionsData::ForExtension(extension)
+          ->RequiresActionForScriptExecution(extension,
+                                             -1,  // No tab id.
+                                             GURL());
 
   if (extension->HasAPIPermission(APIPermission::kActiveTab) ||
       requires_action_for_script_execution) {
     URLPattern pattern(UserScript::ValidUserScriptSchemes());
     // Pattern parsing could fail if this is an unsupported URL e.g. chrome://.
     if (pattern.Parse(web_contents()->GetURL().spec()) ==
             URLPattern::PARSE_SUCCESS) {
       new_hosts.AddPattern(pattern);
     }
     new_apis.insert(APIPermission::kTab);
   }
 
   if (extension->HasAPIPermission(APIPermission::kTabCapture))
     new_apis.insert(APIPermission::kTabCaptureForTab);
 
   if (!new_apis.empty() || !new_hosts.is_empty()) {
     granted_extensions_.Insert(extension);
     scoped_refptr<const PermissionSet> new_permissions =
         new PermissionSet(new_apis, ManifestPermissionSet(),
                           new_hosts, URLPatternSet());
-    PermissionsData::UpdateTabSpecificPermissions(extension,
-                                                  tab_id_,
-                                                  new_permissions);
+    PermissionsData::ForExtension(extension)

[not at google - send to devlin, 2014/06/02 23:20:06]

and here

[Devlin, 2014/06/03 15:28:21]

Done.

+        ->UpdateTabSpecificPermissions(tab_id_, new_permissions);
     const content::NavigationEntry* navigation_entry =
         web_contents()->GetController().GetVisibleEntry();
     if (navigation_entry) {
       Send(new ExtensionMsg_UpdateTabSpecificPermissions(
           navigation_entry->GetPageID(),
           tab_id_,
           extension->id(),
           new_hosts));
       // If more things ever need to know about this, we should consider making
       // an observer class.
@@ skipping 29 matching lines @@
 }
 
 void ActiveTabPermissionGranter::ClearActiveExtensionsAndNotify() {
   if (granted_extensions_.is_empty())
     return;
 
   std::vector<std::string> extension_ids;
 
   for (ExtensionSet::const_iterator it = granted_extensions_.begin();
        it != granted_extensions_.end(); ++it) {
-    PermissionsData::ClearTabSpecificPermissions(it->get(), tab_id_);
+    PermissionsData::ForExtension(it->get())
+        ->ClearTabSpecificPermissions(tab_id_);
     extension_ids.push_back((*it)->id());
   }
 
   Send(new ExtensionMsg_ClearTabSpecificPermissions(tab_id_, extension_ids));
   granted_extensions_.Clear();
 }
 
 }  // namespace extensions