Refactor PermissionsData pt1

chrome/browser/extensions/active_tab_unittest.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 <string>
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/values.h"
@@ skipping 89 matching lines @@
   bool IsAllowed(const scoped_refptr<const Extension>& extension,
                  const GURL& url,
                  PermittedFeature feature) {
     return IsAllowed(extension, url, feature, tab_id());
   }
 
   bool IsAllowed(const scoped_refptr<const Extension>& extension,
                  const GURL& url,
                  PermittedFeature feature,
                  int tab_id) {
-    bool script = PermissionsData::CanExecuteScriptOnPage(
-               extension.get(), url, url, tab_id, NULL, -1, NULL);
+    bool script =
+        PermissionsData::ForExtension(extension)->CanExecuteScriptOnPage(
+            extension, url, url, tab_id, NULL, -1, NULL);
     bool capture = HasTabsPermission(extension, tab_id) &&
-        PermissionsData::CanCaptureVisiblePage(extension.get(), tab_id, NULL);
+                   PermissionsData::ForExtension(extension)

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

here

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

Done.

+                       ->CanCaptureVisiblePage(tab_id, NULL);
     switch (feature) {
       case PERMITTED_SCRIPT_ONLY:
         return script && !capture;
       case PERMITTED_CAPTURE_ONLY:
         return capture && !script;
       case PERMITTED_BOTH:
         return script && capture;
       case PERMITTED_NONE:
         return !script && !capture;
     }
@@ skipping 11 matching lines @@
                  int tab_id) {
     return IsAllowed(extension, url, PERMITTED_NONE, tab_id);
   }
 
   bool HasTabsPermission(const scoped_refptr<const Extension>& extension) {
     return HasTabsPermission(extension, tab_id());
   }
 
   bool HasTabsPermission(const scoped_refptr<const Extension>& extension,
                          int tab_id) {
-    return PermissionsData::HasAPIPermissionForTab(
-        extension.get(), tab_id, APIPermission::kTab);
+    return PermissionsData::ForExtension(extension)
+        ->HasAPIPermissionForTab(tab_id, APIPermission::kTab);
   }
 
   bool IsGrantedForTab(const Extension* extension,
                        const content::WebContents* web_contents) {
-    return PermissionsData::HasAPIPermissionForTab(
-        extension,
-        SessionID::IdForTab(web_contents),
-        APIPermission::kTab);
+    return PermissionsData::ForExtension(extension)->HasAPIPermissionForTab(
+        SessionID::IdForTab(web_contents), APIPermission::kTab);
   }
 
   // TODO(justinlin): Remove when tabCapture is moved to stable.
   ScopedCurrentChannel current_channel;
 
   // An extension with the activeTab permission.
   scoped_refptr<const Extension> extension;
 
   // Another extension with activeTab (for good measure).
   scoped_refptr<const Extension> another_extension;
@@ skipping 197 matching lines @@
 }
 
 TEST_F(ActiveTabTest, ChromeUrlGrants) {
   GURL internal("chrome://version");
   NavigateAndCommit(internal);
   active_tab_permission_granter()->GrantIfRequested(
       extension_with_tab_capture.get());
   // Do not grant tabs/hosts permissions for tab.
   EXPECT_TRUE(IsAllowed(extension_with_tab_capture, internal,
                         PERMITTED_CAPTURE_ONLY));
-  EXPECT_TRUE(PermissionsData::HasAPIPermissionForTab(
-      extension_with_tab_capture.get(),
-      tab_id(),
-      APIPermission::kTabCaptureForTab));
+  EXPECT_TRUE(
+      PermissionsData::ForExtension(extension_with_tab_capture)
+          ->HasAPIPermissionForTab(tab_id(), APIPermission::kTabCaptureForTab));
 
   EXPECT_TRUE(IsBlocked(extension_with_tab_capture, internal, tab_id() + 1));
-  EXPECT_FALSE(PermissionsData::HasAPIPermissionForTab(
-      extension_with_tab_capture.get(),
-      tab_id() + 1,
-      APIPermission::kTabCaptureForTab));
+  EXPECT_FALSE(PermissionsData::ForExtension(extension_with_tab_capture)
+                   ->HasAPIPermissionForTab(tab_id() + 1,
+                                            APIPermission::kTabCaptureForTab));
 }
 
 }  // namespace
 }  // namespace extensions