Add an experimental permissions API for extensions.

chrome/common/extensions/extension_permission_set_unittest.cc

 // Copyright (c) 2011 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/common/extensions/extension_permission_set.h"
 
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/chrome_paths.h"
@@ skipping 134 matching lines @@
   hosted_perms.insert(ExtensionAPIPermission::kBackground);
   hosted_perms.insert(ExtensionAPIPermission::kClipboardRead);
   hosted_perms.insert(ExtensionAPIPermission::kClipboardWrite);
   hosted_perms.insert(ExtensionAPIPermission::kChromeAuthPrivate);
   hosted_perms.insert(ExtensionAPIPermission::kChromePrivate);
   hosted_perms.insert(ExtensionAPIPermission::kExperimental);
   hosted_perms.insert(ExtensionAPIPermission::kGeolocation);
   hosted_perms.insert(ExtensionAPIPermission::kNotification);
   hosted_perms.insert(ExtensionAPIPermission::kUnlimitedStorage);
   hosted_perms.insert(ExtensionAPIPermission::kWebstorePrivate);
+  hosted_perms.insert(ExtensionAPIPermission::kPermissions);
 
   ExtensionAPIPermissionSet perms = info->GetAll();
   size_t count = 0;
   for (ExtensionAPIPermissionSet::iterator i = perms.begin();
        i != perms.end(); ++i) {
     count += hosted_perms.count(*i);
     EXPECT_EQ(hosted_perms.count(*i) > 0, info->GetByID(*i)->is_hosted_app());
   }
 
-  EXPECT_EQ(10u, count);
-  EXPECT_EQ(10u, info->get_hosted_app_permission_count());
+  EXPECT_EQ(hosted_perms.size(), count);
+  EXPECT_EQ(hosted_perms.size(), info->get_hosted_app_permission_count());
 }
 
 TEST(ExtensionAPIPermissionTest, ComponentOnlyPermissions) {
   ExtensionPermissionsInfo* info = ExtensionPermissionsInfo::GetInstance();
   ExtensionAPIPermissionSet private_perms;
   private_perms.insert(ExtensionAPIPermission::kChromeAuthPrivate);
   private_perms.insert(ExtensionAPIPermission::kChromeosInfoPrivate);
   private_perms.insert(ExtensionAPIPermission::kFileBrowserPrivate);
   private_perms.insert(ExtensionAPIPermission::kMediaPlayerPrivate);
   private_perms.insert(ExtensionAPIPermission::kWebstorePrivate);
 
   ExtensionAPIPermissionSet perms = info->GetAll();
   int count = 0;
   for (ExtensionAPIPermissionSet::iterator i = perms.begin();
        i != perms.end(); ++i) {
     count += private_perms.count(*i);
     EXPECT_EQ(private_perms.count(*i) > 0,
               info->GetByID(*i)->is_component_only());
   }
 
   EXPECT_EQ(5, count);
 }
 
 TEST(ExtensionPermissionSetTest, EffectiveHostPermissions) {
   scoped_refptr<Extension> extension;
-  const ExtensionPermissionSet* permissions = NULL;
+  scoped_refptr<const ExtensionPermissionSet> permissions;
 
   extension = LoadManifest("effective_host_permissions", "empty.json");
-  permissions = extension->permission_set();
+  permissions = extension->GetActivePermissions();
   EXPECT_EQ(0u, extension->GetEffectiveHostPermissions().patterns().size());
   EXPECT_FALSE(permissions->HasEffectiveAccessToURL(
       GURL("http://www.google.com")));
   EXPECT_FALSE(permissions->HasEffectiveAccessToAllHosts());
 
   extension = LoadManifest("effective_host_permissions", "one_host.json");
-  permissions = extension->permission_set();
+  permissions = extension->GetActivePermissions();
   EXPECT_TRUE(permissions->HasEffectiveAccessToURL(
       GURL("http://www.google.com")));
   EXPECT_FALSE(permissions->HasEffectiveAccessToURL(
       GURL("https://www.google.com")));
   EXPECT_FALSE(permissions->HasEffectiveAccessToAllHosts());
 
   extension = LoadManifest("effective_host_permissions",
                            "one_host_wildcard.json");
-  permissions = extension->permission_set();
+  permissions = extension->GetActivePermissions();
   EXPECT_TRUE(permissions->HasEffectiveAccessToURL(GURL("http://google.com")));
   EXPECT_TRUE(permissions->HasEffectiveAccessToURL(
       GURL("http://foo.google.com")));
   EXPECT_FALSE(permissions->HasEffectiveAccessToAllHosts());
 
   extension = LoadManifest("effective_host_permissions", "two_hosts.json");
-  permissions = extension->permission_set();
+  permissions = extension->GetActivePermissions();
   EXPECT_TRUE(permissions->HasEffectiveAccessToURL(
       GURL("http://www.google.com")));
   EXPECT_TRUE(permissions->HasEffectiveAccessToURL(
       GURL("http://www.reddit.com")));
   EXPECT_FALSE(permissions->HasEffectiveAccessToAllHosts());
 
   extension = LoadManifest("effective_host_permissions",
                            "https_not_considered.json");
-  permissions = extension->permission_set();
+  permissions = extension->GetActivePermissions();
   EXPECT_TRUE(permissions->HasEffectiveAccessToURL(GURL("http://google.com")));
   EXPECT_TRUE(permissions->HasEffectiveAccessToURL(GURL("https://google.com")));
   EXPECT_FALSE(permissions->HasEffectiveAccessToAllHosts());
 
   extension = LoadManifest("effective_host_permissions",
                            "two_content_scripts.json");
-  permissions = extension->permission_set();
+  permissions = extension->GetActivePermissions();
   EXPECT_TRUE(permissions->HasEffectiveAccessToURL(GURL("http://google.com")));
   EXPECT_TRUE(permissions->HasEffectiveAccessToURL(
       GURL("http://www.reddit.com")));
   EXPECT_TRUE(permissions->HasEffectiveAccessToURL(
       GURL("http://news.ycombinator.com")));
   EXPECT_FALSE(permissions->HasEffectiveAccessToAllHosts());
 
   extension = LoadManifest("effective_host_permissions", "all_hosts.json");
-  permissions = extension->permission_set();
+  permissions = extension->GetActivePermissions();
   EXPECT_TRUE(permissions->HasEffectiveAccessToURL(GURL("http://test/")));
   EXPECT_FALSE(permissions->HasEffectiveAccessToURL(GURL("https://test/")));
   EXPECT_TRUE(
       permissions->HasEffectiveAccessToURL(GURL("http://www.google.com")));
   EXPECT_TRUE(permissions->HasEffectiveAccessToAllHosts());
 
   extension = LoadManifest("effective_host_permissions", "all_hosts2.json");
-  permissions = extension->permission_set();
+  permissions = extension->GetActivePermissions();
   EXPECT_TRUE(permissions->HasEffectiveAccessToURL(GURL("http://test/")));
   EXPECT_TRUE(
       permissions->HasEffectiveAccessToURL(GURL("http://www.google.com")));
   EXPECT_TRUE(permissions->HasEffectiveAccessToAllHosts());
 
   extension = LoadManifest("effective_host_permissions", "all_hosts3.json");
-  permissions = extension->permission_set();
+  permissions = extension->GetActivePermissions();
   EXPECT_FALSE(permissions->HasEffectiveAccessToURL(GURL("http://test/")));
   EXPECT_TRUE(permissions->HasEffectiveAccessToURL(GURL("https://test/")));
   EXPECT_TRUE(
       permissions->HasEffectiveAccessToURL(GURL("http://www.google.com")));
   EXPECT_TRUE(permissions->HasEffectiveAccessToAllHosts());
 }
 
 TEST(ExtensionPermissionSetTest, ExplicitAccessToOrigin) {
   ExtensionAPIPermissionSet apis;
   URLPatternSet explicit_hosts;
   URLPatternSet scriptable_hosts;
 
   AddPattern(&explicit_hosts, "http://*.google.com/*");
   // The explicit host paths should get set to /*.
   AddPattern(&explicit_hosts, "http://www.example.com/a/particular/path/*");
 
-  ExtensionPermissionSet perm_set(apis, explicit_hosts, scriptable_hosts);
-  ASSERT_TRUE(perm_set.HasExplicitAccessToOrigin(
+  scoped_refptr<ExtensionPermissionSet> perm_set = new ExtensionPermissionSet(
+      apis, explicit_hosts, scriptable_hosts);
+  ASSERT_TRUE(perm_set->HasExplicitAccessToOrigin(
       GURL("http://www.google.com/")));
-  ASSERT_TRUE(perm_set.HasExplicitAccessToOrigin(
+  ASSERT_TRUE(perm_set->HasExplicitAccessToOrigin(
       GURL("http://test.google.com/")));
-  ASSERT_TRUE(perm_set.HasExplicitAccessToOrigin(
+  ASSERT_TRUE(perm_set->HasExplicitAccessToOrigin(
       GURL("http://www.example.com")));
-  ASSERT_TRUE(perm_set.HasEffectiveAccessToURL(
+  ASSERT_TRUE(perm_set->HasEffectiveAccessToURL(
       GURL("http://www.example.com")));
-  ASSERT_FALSE(perm_set.HasExplicitAccessToOrigin(
+  ASSERT_FALSE(perm_set->HasExplicitAccessToOrigin(
       GURL("http://test.example.com")));
 }
 
 TEST(ExtensionPermissionSetTest, CreateUnion) {
   ExtensionAPIPermissionSet apis1;
   ExtensionAPIPermissionSet apis2;
   ExtensionAPIPermissionSet expected_apis;
 
   URLPatternSet explicit_hosts1;
   URLPatternSet explicit_hosts2;
   URLPatternSet expected_explicit_hosts;
 
   URLPatternSet scriptable_hosts1;
   URLPatternSet scriptable_hosts2;
   URLPatternSet expected_scriptable_hosts;
 
   URLPatternSet effective_hosts;
 
-  scoped_ptr<ExtensionPermissionSet> set1;
-  scoped_ptr<ExtensionPermissionSet> set2;
-  scoped_ptr<ExtensionPermissionSet> union_set;
+  scoped_refptr<ExtensionPermissionSet> set1;
+  scoped_refptr<ExtensionPermissionSet> set2;
+  scoped_refptr<ExtensionPermissionSet> union_set;
 
   // Union with an empty set.
   apis1.insert(ExtensionAPIPermission::kTab);
   apis1.insert(ExtensionAPIPermission::kBackground);
   expected_apis.insert(ExtensionAPIPermission::kTab);
   expected_apis.insert(ExtensionAPIPermission::kBackground);
 
   AddPattern(&explicit_hosts1, "http://*.google.com/*");
   AddPattern(&expected_explicit_hosts, "http://*.google.com/*");
   AddPattern(&effective_hosts, "http://*.google.com/*");
 
-  set1.reset(new ExtensionPermissionSet(
-      apis1, explicit_hosts1, scriptable_hosts1));
-  set2.reset(new ExtensionPermissionSet(
-      apis2, explicit_hosts2, scriptable_hosts2));
-  union_set.reset(ExtensionPermissionSet::CreateUnion(set1.get(), set2.get()));
+  set1 = new ExtensionPermissionSet(apis1, explicit_hosts1, scriptable_hosts1);
+  set2 = new ExtensionPermissionSet(apis2, explicit_hosts2, scriptable_hosts2);
+  union_set = ExtensionPermissionSet::CreateUnion(set1.get(), set2.get());
+  EXPECT_TRUE(set1->Contains(*set2));
+  EXPECT_TRUE(set1->Contains(*union_set));
+  EXPECT_FALSE(set2->Contains(*set1));
+  EXPECT_FALSE(set2->Contains(*union_set));
+  EXPECT_TRUE(union_set->Contains(*set1));
+  EXPECT_TRUE(union_set->Contains(*set2));
 
   EXPECT_FALSE(union_set->HasEffectiveFullAccess());
   EXPECT_EQ(expected_apis, union_set->apis());
   EXPECT_EQ(expected_explicit_hosts, union_set->explicit_hosts());
   EXPECT_EQ(expected_scriptable_hosts, union_set->scriptable_hosts());
   EXPECT_EQ(expected_explicit_hosts, union_set->effective_hosts());
 
   // Now use a real second set.
   apis2.insert(ExtensionAPIPermission::kTab);
   apis2.insert(ExtensionAPIPermission::kProxy);
   apis2.insert(ExtensionAPIPermission::kClipboardWrite);
   apis2.insert(ExtensionAPIPermission::kPlugin);
   expected_apis.insert(ExtensionAPIPermission::kTab);
   expected_apis.insert(ExtensionAPIPermission::kProxy);
   expected_apis.insert(ExtensionAPIPermission::kClipboardWrite);
   expected_apis.insert(ExtensionAPIPermission::kPlugin);
 
   AddPattern(&explicit_hosts2, "http://*.example.com/*");
   AddPattern(&scriptable_hosts2, "http://*.google.com/*");
   AddPattern(&expected_explicit_hosts, "http://*.example.com/*");
   AddPattern(&expected_scriptable_hosts, "http://*.google.com/*");
 
   effective_hosts.ClearPatterns();
   AddPattern(&effective_hosts, "<all_urls>");
 
-  set2.reset(new ExtensionPermissionSet(
-      apis2, explicit_hosts2, scriptable_hosts2));
-  union_set.reset(ExtensionPermissionSet::CreateUnion(set1.get(), set2.get()));
+  set2 = new ExtensionPermissionSet(apis2, explicit_hosts2, scriptable_hosts2);
+  union_set = ExtensionPermissionSet::CreateUnion(set1.get(), set2.get());
+
+  EXPECT_FALSE(set1->Contains(*set2));
+  EXPECT_FALSE(set1->Contains(*union_set));
+  EXPECT_FALSE(set2->Contains(*set1));
+  EXPECT_FALSE(set2->Contains(*union_set));
+  EXPECT_TRUE(union_set->Contains(*set1));
+  EXPECT_TRUE(union_set->Contains(*set2));
+
   EXPECT_TRUE(union_set->HasEffectiveFullAccess());
   EXPECT_TRUE(union_set->HasEffectiveAccessToAllHosts());
   EXPECT_EQ(expected_apis, union_set->apis());
   EXPECT_EQ(expected_explicit_hosts, union_set->explicit_hosts());
   EXPECT_EQ(expected_scriptable_hosts, union_set->scriptable_hosts());
   EXPECT_EQ(effective_hosts, union_set->effective_hosts());
 }
 
+TEST(ExtensionPermissionSetTest, CreateIntersection) {
+  ExtensionAPIPermissionSet apis1;
+  ExtensionAPIPermissionSet apis2;
+  ExtensionAPIPermissionSet expected_apis;
+
+  URLPatternSet explicit_hosts1;
+  URLPatternSet explicit_hosts2;
+  URLPatternSet expected_explicit_hosts;
+
+  URLPatternSet scriptable_hosts1;
+  URLPatternSet scriptable_hosts2;
+  URLPatternSet expected_scriptable_hosts;
+
+  URLPatternSet effective_hosts;
+
+  scoped_refptr<ExtensionPermissionSet> set1;
+  scoped_refptr<ExtensionPermissionSet> set2;
+  scoped_refptr<ExtensionPermissionSet> new_set;
+
+  // Intersection with an empty set.
+  apis1.insert(ExtensionAPIPermission::kTab);
+  apis1.insert(ExtensionAPIPermission::kBackground);
+
+  AddPattern(&explicit_hosts1, "http://*.google.com/*");
+  AddPattern(&scriptable_hosts1, "http://www.reddit.com/*");
+
+  set1 = new ExtensionPermissionSet(apis1, explicit_hosts1, scriptable_hosts1);
+  set2 = new ExtensionPermissionSet(apis2, explicit_hosts2, scriptable_hosts2);
+  new_set = ExtensionPermissionSet::CreateIntersection(set1.get(), set2.get());
+  EXPECT_TRUE(set1->Contains(*new_set));
+  EXPECT_TRUE(set2->Contains(*new_set));
+  EXPECT_TRUE(set1->Contains(*set2));
+  EXPECT_FALSE(set2->Contains(*set1));
+  EXPECT_FALSE(new_set->Contains(*set1));
+  EXPECT_TRUE(new_set->Contains(*set2));
+
+  EXPECT_TRUE(new_set->IsEmpty());
+  EXPECT_FALSE(new_set->HasEffectiveFullAccess());
+  EXPECT_EQ(expected_apis, new_set->apis());
+  EXPECT_EQ(expected_explicit_hosts, new_set->explicit_hosts());
+  EXPECT_EQ(expected_scriptable_hosts, new_set->scriptable_hosts());
+  EXPECT_EQ(expected_explicit_hosts, new_set->effective_hosts());
+
+  // Now use a real second set.
+  apis2.insert(ExtensionAPIPermission::kTab);
+  apis2.insert(ExtensionAPIPermission::kProxy);
+  apis2.insert(ExtensionAPIPermission::kClipboardWrite);
+  apis2.insert(ExtensionAPIPermission::kPlugin);
+  expected_apis.insert(ExtensionAPIPermission::kTab);
+
+  AddPattern(&explicit_hosts2, "http://*.example.com/*");
+  AddPattern(&explicit_hosts2, "http://*.google.com/*");
+  AddPattern(&scriptable_hosts2, "http://*.google.com/*");
+  AddPattern(&expected_explicit_hosts, "http://*.google.com/*");
+
+  effective_hosts.ClearPatterns();
+  AddPattern(&effective_hosts, "http://*.google.com/*");
+
+  set2 = new ExtensionPermissionSet(apis2, explicit_hosts2, scriptable_hosts2);
+  new_set = ExtensionPermissionSet::CreateIntersection(set1.get(), set2.get());
+
+  EXPECT_TRUE(set1->Contains(*new_set));
+  EXPECT_TRUE(set2->Contains(*new_set));
+  EXPECT_FALSE(set1->Contains(*set2));
+  EXPECT_FALSE(set2->Contains(*set1));
+  EXPECT_FALSE(new_set->Contains(*set1));
+  EXPECT_FALSE(new_set->Contains(*set2));
+
+  EXPECT_FALSE(new_set->HasEffectiveFullAccess());
+  EXPECT_FALSE(new_set->HasEffectiveAccessToAllHosts());
+  EXPECT_EQ(expected_apis, new_set->apis());
+  EXPECT_EQ(expected_explicit_hosts, new_set->explicit_hosts());
+  EXPECT_EQ(expected_scriptable_hosts, new_set->scriptable_hosts());
+  EXPECT_EQ(effective_hosts, new_set->effective_hosts());
+}
+
+TEST(ExtensionPermissionSetTest, CreateDifference) {
+  ExtensionAPIPermissionSet apis1;
+  ExtensionAPIPermissionSet apis2;
+  ExtensionAPIPermissionSet expected_apis;
+
+  URLPatternSet explicit_hosts1;
+  URLPatternSet explicit_hosts2;
+  URLPatternSet expected_explicit_hosts;
+
+  URLPatternSet scriptable_hosts1;
+  URLPatternSet scriptable_hosts2;
+  URLPatternSet expected_scriptable_hosts;
+
+  URLPatternSet effective_hosts;
+
+  scoped_refptr<ExtensionPermissionSet> set1;
+  scoped_refptr<ExtensionPermissionSet> set2;
+  scoped_refptr<ExtensionPermissionSet> new_set;
+
+  // Difference with an empty set.
+  apis1.insert(ExtensionAPIPermission::kTab);
+  apis1.insert(ExtensionAPIPermission::kBackground);
+
+  AddPattern(&explicit_hosts1, "http://*.google.com/*");
+  AddPattern(&scriptable_hosts1, "http://www.reddit.com/*");
+
+  set1 = new ExtensionPermissionSet(apis1, explicit_hosts1, scriptable_hosts1);
+  set2 = new ExtensionPermissionSet(apis2, explicit_hosts2, scriptable_hosts2);
+  new_set = ExtensionPermissionSet::CreateDifference(set1.get(), set2.get());
+  EXPECT_EQ(*set1, *new_set);
+
+  // Now use a real second set.
+  apis2.insert(ExtensionAPIPermission::kTab);
+  apis2.insert(ExtensionAPIPermission::kProxy);
+  apis2.insert(ExtensionAPIPermission::kClipboardWrite);
+  apis2.insert(ExtensionAPIPermission::kPlugin);
+  expected_apis.insert(ExtensionAPIPermission::kBackground);
+
+  AddPattern(&explicit_hosts2, "http://*.example.com/*");
+  AddPattern(&explicit_hosts2, "http://*.google.com/*");
+  AddPattern(&scriptable_hosts2, "http://*.google.com/*");
+  AddPattern(&expected_scriptable_hosts, "http://www.reddit.com/*");
+
+  effective_hosts.ClearPatterns();
+  AddPattern(&effective_hosts, "http://www.reddit.com/*");
+
+  set2 = new ExtensionPermissionSet(apis2, explicit_hosts2, scriptable_hosts2);
+  new_set = ExtensionPermissionSet::CreateDifference(set1.get(), set2.get());
+
+  EXPECT_TRUE(set1->Contains(*new_set));
+  EXPECT_FALSE(set2->Contains(*new_set));
+
+  EXPECT_FALSE(new_set->HasEffectiveFullAccess());
+  EXPECT_FALSE(new_set->HasEffectiveAccessToAllHosts());
+  EXPECT_EQ(expected_apis, new_set->apis());
+  EXPECT_EQ(expected_explicit_hosts, new_set->explicit_hosts());
+  EXPECT_EQ(expected_scriptable_hosts, new_set->scriptable_hosts());
+  EXPECT_EQ(effective_hosts, new_set->effective_hosts());
+
+  // |set3| = |set1| - |set2| --> |set3| intersect |set2| == empty_set
+  set1 = ExtensionPermissionSet::CreateIntersection(new_set.get(), set2.get());
+  EXPECT_TRUE(set1->IsEmpty());
+}
+
 TEST(ExtensionPermissionSetTest, HasLessPrivilegesThan) {
   const struct {
     const char* base_name;
     // Increase these sizes if you have more than 10.
     const char* granted_apis[10];
     const char* granted_hosts[10];
     bool full_access;
     bool expect_increase;
   } kTests[] = {
     { "allhosts1", {NULL}, {"http://*/", NULL}, false,
@@ skipping 61 matching lines @@
     }
 
     URLPatternSet granted_hosts;
     for (size_t j = 0; kTests[i].granted_hosts[j] != NULL; ++j)
       AddPattern(&granted_hosts, kTests[i].granted_hosts[j]);
 
     EXPECT_TRUE(new_extension.get()) << kTests[i].base_name << "_new.json";
     if (!new_extension.get())
       continue;
 
-    const ExtensionPermissionSet* old_p = old_extension->permission_set();
-    const ExtensionPermissionSet* new_p = new_extension->permission_set();
+    scoped_refptr<const ExtensionPermissionSet> old_p(
+        old_extension->GetActivePermissions());
+    scoped_refptr<const ExtensionPermissionSet> new_p(
+        new_extension->GetActivePermissions());
 
-    EXPECT_EQ(kTests[i].expect_increase, old_p->HasLessPrivilegesThan(new_p))
-        << kTests[i].base_name;
+    EXPECT_EQ(kTests[i].expect_increase,
+              old_p->HasLessPrivilegesThan(new_p)) << kTests[i].base_name;
   }
 }
 
 TEST(ExtensionPermissionSetTest, PermissionMessages) {
   // Ensure that all permissions that needs to show install UI actually have
   // strings associated with them.
   ExtensionAPIPermissionSet skip;
 
   skip.insert(ExtensionAPIPermission::kDefault);
 
@@ skipping 31 matching lines @@
   skip.insert(ExtensionAPIPermission::kFileBrowserPrivate);
   skip.insert(ExtensionAPIPermission::kMediaPlayerPrivate);
   skip.insert(ExtensionAPIPermission::kChromeAuthPrivate);
   skip.insert(ExtensionAPIPermission::kChromePrivate);
   skip.insert(ExtensionAPIPermission::kChromeosInfoPrivate);
   skip.insert(ExtensionAPIPermission::kWebSocketProxyPrivate);
   skip.insert(ExtensionAPIPermission::kInputMethodPrivate);
 
   // Warned as part of host permissions.
   skip.insert(ExtensionAPIPermission::kDevtools);
+
+  // This will warn users later, when they request new permissions.
+  skip.insert(ExtensionAPIPermission::kPermissions);
+
   ExtensionPermissionsInfo* info = ExtensionPermissionsInfo::GetInstance();
   ExtensionAPIPermissionSet permissions = info->GetAll();
   for (ExtensionAPIPermissionSet::const_iterator i = permissions.begin();
        i != permissions.end(); ++i) {
     ExtensionAPIPermission* permission = info->GetByID(*i);
     EXPECT_TRUE(permission);
     if (skip.count(*i)) {
       EXPECT_EQ(ExtensionPermissionMessage::kNone, permission->message_id())
           << "unexpected message_id for " << permission->name();
     } else {
@@ skipping 27 matching lines @@
     { "tabs.onUpdated", false },
     // Make sure we find the module name after stripping '.' and '/'.
     { "browserAction/abcd/onClick",  true },
     { "browserAction.abcd.onClick",  true },
     // Test Tabs functions.
     { "tabs.create",      true},
     { "tabs.update",      true},
     { "tabs.getSelected", false},
   };
 
-  ExtensionPermissionSet permissions;
+  scoped_refptr<ExtensionPermissionSet> empty = new ExtensionPermissionSet();
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kTests); ++i) {
     EXPECT_EQ(kTests[i].expect_success,
-              permissions.HasAccessToFunction(kTests[i].permission_name));
+              empty->HasAccessToFunction(kTests[i].permission_name));
   }
 }
 
 TEST(ExtensionPermissionSetTest, GetWarningMessages_ManyHosts) {
   scoped_refptr<Extension> extension;
 
   extension = LoadManifest("permissions", "many-hosts.json");
   std::vector<string16> warnings =
-      extension->permission_set()->GetWarningMessages();
+      extension->GetActivePermissions()->GetWarningMessages();
   ASSERT_EQ(1u, warnings.size());
   EXPECT_EQ("Your data on encrypted.google.com and www.google.com",
             UTF16ToUTF8(warnings[0]));
 }
 
 TEST(ExtensionPermissionSetTest, GetWarningMessages_Plugins) {
   scoped_refptr<Extension> extension;
-  scoped_ptr<ExtensionPermissionSet> permissions;
+  scoped_refptr<ExtensionPermissionSet> permissions;
 
   extension = LoadManifest("permissions", "plugins.json");
   std::vector<string16> warnings =
-      extension->permission_set()->GetWarningMessages();
+      extension->GetActivePermissions()->GetWarningMessages();
   // We don't parse the plugins key on Chrome OS, so it should not ask for any
   // permissions.
 #if defined(OS_CHROMEOS)
   ASSERT_EQ(0u, warnings.size());
 #else
   ASSERT_EQ(1u, warnings.size());
   EXPECT_EQ("All data on your computer and the websites you visit",
             UTF16ToUTF8(warnings[0]));
 #endif
 }
 
 TEST(ExtensionPermissionSetTest, GetDistinctHostsForDisplay) {
-  scoped_ptr<ExtensionPermissionSet> perm_set;
+  scoped_refptr<ExtensionPermissionSet> perm_set;
   ExtensionAPIPermissionSet empty_perms;
   std::set<std::string> expected;
   expected.insert("www.foo.com");
   expected.insert("www.bar.com");
   expected.insert("www.baz.com");
   URLPatternSet explicit_hosts;
   URLPatternSet scriptable_hosts;
 
   {
     SCOPED_TRACE("no dupes");
 
     // Simple list with no dupes.
     explicit_hosts.AddPattern(
         URLPattern(URLPattern::SCHEME_HTTP, "http://www.foo.com/path"));
     explicit_hosts.AddPattern(
         URLPattern(URLPattern::SCHEME_HTTP, "http://www.bar.com/path"));
     explicit_hosts.AddPattern(
         URLPattern(URLPattern::SCHEME_HTTP, "http://www.baz.com/path"));
-    perm_set.reset(new ExtensionPermissionSet(
-       empty_perms, explicit_hosts, scriptable_hosts));
+    perm_set = new ExtensionPermissionSet(
+        empty_perms, explicit_hosts, scriptable_hosts);
     EXPECT_EQ(expected, perm_set->GetDistinctHostsForDisplay());
   }
 
   {
     SCOPED_TRACE("two dupes");
 
     // Add some dupes.
     explicit_hosts.AddPattern(
         URLPattern(URLPattern::SCHEME_HTTP, "http://www.foo.com/path"));
     explicit_hosts.AddPattern(
         URLPattern(URLPattern::SCHEME_HTTP, "http://www.baz.com/path"));
-    perm_set.reset(new ExtensionPermissionSet(
-            empty_perms, explicit_hosts, scriptable_hosts));
+    perm_set = new ExtensionPermissionSet(
+        empty_perms, explicit_hosts, scriptable_hosts);
     EXPECT_EQ(expected, perm_set->GetDistinctHostsForDisplay());
   }
 
   {
     SCOPED_TRACE("schemes differ");
 
     // Add a pattern that differs only by scheme. This should be filtered out.
     explicit_hosts.AddPattern(
         URLPattern(URLPattern::SCHEME_HTTPS, "https://www.bar.com/path"));
-    perm_set.reset(new ExtensionPermissionSet(
-            empty_perms, explicit_hosts, scriptable_hosts));
+    perm_set = new ExtensionPermissionSet(
+        empty_perms, explicit_hosts, scriptable_hosts);
     EXPECT_EQ(expected, perm_set->GetDistinctHostsForDisplay());
   }
 
   {
     SCOPED_TRACE("paths differ");
 
     // Add some dupes by path.
     explicit_hosts.AddPattern(
         URLPattern(URLPattern::SCHEME_HTTP, "http://www.bar.com/pathypath"));
-    perm_set.reset(new ExtensionPermissionSet(
-            empty_perms, explicit_hosts, scriptable_hosts));
+    perm_set = new ExtensionPermissionSet(
+        empty_perms, explicit_hosts, scriptable_hosts);
     EXPECT_EQ(expected, perm_set->GetDistinctHostsForDisplay());
   }
 
   {
     SCOPED_TRACE("subdomains differ");
 
     // We don't do anything special for subdomains.
     explicit_hosts.AddPattern(
         URLPattern(URLPattern::SCHEME_HTTP, "http://monkey.www.bar.com/path"));
     explicit_hosts.AddPattern(
         URLPattern(URLPattern::SCHEME_HTTP, "http://bar.com/path"));
 
     expected.insert("monkey.www.bar.com");
     expected.insert("bar.com");
 
-    perm_set.reset(new ExtensionPermissionSet(
-            empty_perms, explicit_hosts, scriptable_hosts));
+    perm_set = new ExtensionPermissionSet(
+        empty_perms, explicit_hosts, scriptable_hosts);
     EXPECT_EQ(expected, perm_set->GetDistinctHostsForDisplay());
   }
 
   {
     SCOPED_TRACE("RCDs differ");
 
     // Now test for RCD uniquing.
     explicit_hosts.AddPattern(
         URLPattern(URLPattern::SCHEME_HTTP, "http://www.foo.com/path"));
     explicit_hosts.AddPattern(
         URLPattern(URLPattern::SCHEME_HTTP, "http://www.foo.co.uk/path"));
     explicit_hosts.AddPattern(
         URLPattern(URLPattern::SCHEME_HTTP, "http://www.foo.de/path"));
     explicit_hosts.AddPattern(
         URLPattern(URLPattern::SCHEME_HTTP, "http://www.foo.ca.us/path"));
     explicit_hosts.AddPattern(
         URLPattern(URLPattern::SCHEME_HTTP, "http://www.foo.net/path"));
     explicit_hosts.AddPattern(
         URLPattern(URLPattern::SCHEME_HTTP, "http://www.foo.com.my/path"));
 
     // This is an unknown RCD, which shouldn't be uniqued out.
     explicit_hosts.AddPattern(
         URLPattern(URLPattern::SCHEME_HTTP, "http://www.foo.xyzzy/path"));
     // But it should only occur once.
     explicit_hosts.AddPattern(
         URLPattern(URLPattern::SCHEME_HTTP, "http://www.foo.xyzzy/path"));
 
     expected.insert("www.foo.xyzzy");
 
-    perm_set.reset(new ExtensionPermissionSet(
-            empty_perms, explicit_hosts, scriptable_hosts));
+    perm_set = new ExtensionPermissionSet(
+        empty_perms, explicit_hosts, scriptable_hosts);
     EXPECT_EQ(expected, perm_set->GetDistinctHostsForDisplay());
   }
 
   {
     SCOPED_TRACE("wildcards");
 
     explicit_hosts.AddPattern(
         URLPattern(URLPattern::SCHEME_HTTP, "http://*.google.com/*"));
 
     expected.insert("*.google.com");
 
-    perm_set.reset(new ExtensionPermissionSet(
-            empty_perms, explicit_hosts, scriptable_hosts));
+    perm_set = new ExtensionPermissionSet(
+        empty_perms, explicit_hosts, scriptable_hosts);
     EXPECT_EQ(expected, perm_set->GetDistinctHostsForDisplay());
   }
 
   {
     SCOPED_TRACE("scriptable hosts");
     explicit_hosts.ClearPatterns();
     scriptable_hosts.ClearPatterns();
     expected.clear();
 
     explicit_hosts.AddPattern(
         URLPattern(URLPattern::SCHEME_HTTP, "http://*.google.com/*"));
     scriptable_hosts.AddPattern(
         URLPattern(URLPattern::SCHEME_HTTP, "http://*.example.com/*"));
 
     expected.insert("*.google.com");
     expected.insert("*.example.com");
 
-    perm_set.reset(new ExtensionPermissionSet(
-            empty_perms, explicit_hosts, scriptable_hosts));
+    perm_set = new ExtensionPermissionSet(
+        empty_perms, explicit_hosts, scriptable_hosts);
     EXPECT_EQ(expected, perm_set->GetDistinctHostsForDisplay());
   }
 }
 
 TEST(ExtensionPermissionSetTest, GetDistinctHostsForDisplay_ComIsBestRcd) {
-  scoped_ptr<ExtensionPermissionSet> perm_set;
+  scoped_refptr<ExtensionPermissionSet> perm_set;
   ExtensionAPIPermissionSet empty_perms;
   URLPatternSet explicit_hosts;
   URLPatternSet scriptable_hosts;
   explicit_hosts.AddPattern(
       URLPattern(URLPattern::SCHEME_HTTP, "http://www.foo.ca/path"));
   explicit_hosts.AddPattern(
       URLPattern(URLPattern::SCHEME_HTTP, "http://www.foo.org/path"));
   explicit_hosts.AddPattern(
       URLPattern(URLPattern::SCHEME_HTTP, "http://www.foo.co.uk/path"));
   explicit_hosts.AddPattern(
       URLPattern(URLPattern::SCHEME_HTTP, "http://www.foo.net/path"));
   explicit_hosts.AddPattern(
       URLPattern(URLPattern::SCHEME_HTTP, "http://www.foo.jp/path"));
   explicit_hosts.AddPattern(
       URLPattern(URLPattern::SCHEME_HTTP, "http://www.foo.com/path"));
 
   std::set<std::string> expected;
   expected.insert("www.foo.com");
-  perm_set.reset(new ExtensionPermissionSet(
-      empty_perms, explicit_hosts, scriptable_hosts));
+  perm_set = new ExtensionPermissionSet(
+      empty_perms, explicit_hosts, scriptable_hosts);
   EXPECT_EQ(expected, perm_set->GetDistinctHostsForDisplay());
 }
 
 TEST(ExtensionPermissionSetTest, GetDistinctHostsForDisplay_NetIs2ndBestRcd) {
-  scoped_ptr<ExtensionPermissionSet> perm_set;
+  scoped_refptr<ExtensionPermissionSet> perm_set;
   ExtensionAPIPermissionSet empty_perms;
   URLPatternSet explicit_hosts;
   URLPatternSet scriptable_hosts;
   explicit_hosts.AddPattern(
       URLPattern(URLPattern::SCHEME_HTTP, "http://www.foo.ca/path"));
   explicit_hosts.AddPattern(
       URLPattern(URLPattern::SCHEME_HTTP, "http://www.foo.org/path"));
   explicit_hosts.AddPattern(
       URLPattern(URLPattern::SCHEME_HTTP, "http://www.foo.co.uk/path"));
   explicit_hosts.AddPattern(
       URLPattern(URLPattern::SCHEME_HTTP, "http://www.foo.net/path"));
   explicit_hosts.AddPattern(
       URLPattern(URLPattern::SCHEME_HTTP, "http://www.foo.jp/path"));
   // No http://www.foo.com/path
 
   std::set<std::string> expected;
   expected.insert("www.foo.net");
-  perm_set.reset(new ExtensionPermissionSet(
-      empty_perms, explicit_hosts, scriptable_hosts));
+  perm_set = new ExtensionPermissionSet(
+      empty_perms, explicit_hosts, scriptable_hosts);
   EXPECT_EQ(expected, perm_set->GetDistinctHostsForDisplay());
 }
 
 TEST(ExtensionPermissionSetTest,
      GetDistinctHostsForDisplay_OrgIs3rdBestRcd) {
-  scoped_ptr<ExtensionPermissionSet> perm_set;
+  scoped_refptr<ExtensionPermissionSet> perm_set;
   ExtensionAPIPermissionSet empty_perms;
   URLPatternSet explicit_hosts;
   URLPatternSet scriptable_hosts;
   explicit_hosts.AddPattern(
       URLPattern(URLPattern::SCHEME_HTTP, "http://www.foo.ca/path"));
   explicit_hosts.AddPattern(
       URLPattern(URLPattern::SCHEME_HTTP, "http://www.foo.org/path"));
   explicit_hosts.AddPattern(
       URLPattern(URLPattern::SCHEME_HTTP, "http://www.foo.co.uk/path"));
   // No http://www.foo.net/path
   explicit_hosts.AddPattern(
       URLPattern(URLPattern::SCHEME_HTTP, "http://www.foo.jp/path"));
   // No http://www.foo.com/path
 
   std::set<std::string> expected;
   expected.insert("www.foo.org");
-  perm_set.reset(new ExtensionPermissionSet(
-      empty_perms, explicit_hosts, scriptable_hosts));
+  perm_set = new ExtensionPermissionSet(
+      empty_perms, explicit_hosts, scriptable_hosts);
   EXPECT_EQ(expected, perm_set->GetDistinctHostsForDisplay());
 }
 
 TEST(ExtensionPermissionSetTest,
      GetDistinctHostsForDisplay_FirstInListIs4thBestRcd) {
-  scoped_ptr<ExtensionPermissionSet> perm_set;
+  scoped_refptr<ExtensionPermissionSet> perm_set;
   ExtensionAPIPermissionSet empty_perms;
   URLPatternSet explicit_hosts;
   URLPatternSet scriptable_hosts;
   explicit_hosts.AddPattern(
       URLPattern(URLPattern::SCHEME_HTTP, "http://www.foo.ca/path"));
   // No http://www.foo.org/path
   explicit_hosts.AddPattern(
       URLPattern(URLPattern::SCHEME_HTTP, "http://www.foo.co.uk/path"));
   // No http://www.foo.net/path
   explicit_hosts.AddPattern(
       URLPattern(URLPattern::SCHEME_HTTP, "http://www.foo.jp/path"));
   // No http://www.foo.com/path
 
   std::set<std::string> expected;
   expected.insert("www.foo.ca");
-  perm_set.reset(new ExtensionPermissionSet(
-      empty_perms, explicit_hosts, scriptable_hosts));
+  perm_set = new ExtensionPermissionSet(
+      empty_perms, explicit_hosts, scriptable_hosts);
   EXPECT_EQ(expected, perm_set->GetDistinctHostsForDisplay());
 }
 
 TEST(ExtensionPermissionSetTest, HasLessHostPrivilegesThan) {
   URLPatternSet elist1;
   URLPatternSet elist2;
   URLPatternSet slist1;
   URLPatternSet slist2;
-  scoped_ptr<ExtensionPermissionSet> set1;
-  scoped_ptr<ExtensionPermissionSet> set2;
+  scoped_refptr<ExtensionPermissionSet> set1;
+  scoped_refptr<ExtensionPermissionSet> set2;
   ExtensionAPIPermissionSet empty_perms;
   elist1.AddPattern(
       URLPattern(URLPattern::SCHEME_HTTP, "http://www.google.com.hk/path"));
   elist1.AddPattern(
       URLPattern(URLPattern::SCHEME_HTTP, "http://www.google.com/path"));
 
   // Test that the host order does not matter.
   elist2.AddPattern(
       URLPattern(URLPattern::SCHEME_HTTP, "http://www.google.com/path"));
   elist2.AddPattern(
       URLPattern(URLPattern::SCHEME_HTTP, "http://www.google.com.hk/path"));
 
-  set1.reset(new ExtensionPermissionSet(empty_perms, elist1, slist1));
-  set2.reset(new ExtensionPermissionSet(empty_perms, elist2, slist2));
+  set1 = new ExtensionPermissionSet(empty_perms, elist1, slist1);
+  set2 = new ExtensionPermissionSet(empty_perms, elist2, slist2);
 
   EXPECT_FALSE(set1->HasLessHostPrivilegesThan(set2.get()));
   EXPECT_FALSE(set2->HasLessHostPrivilegesThan(set1.get()));
 
   // Test that paths are ignored.
   elist2.ClearPatterns();
   elist2.AddPattern(
       URLPattern(URLPattern::SCHEME_HTTP, "http://www.google.com/*"));
-  set2.reset(new ExtensionPermissionSet(empty_perms, elist2, slist2));
+  set2 = new ExtensionPermissionSet(empty_perms, elist2, slist2);
   EXPECT_FALSE(set1->HasLessHostPrivilegesThan(set2.get()));
   EXPECT_FALSE(set2->HasLessHostPrivilegesThan(set1.get()));
 
   // Test that RCDs are ignored.
   elist2.ClearPatterns();
   elist2.AddPattern(
       URLPattern(URLPattern::SCHEME_HTTP, "http://www.google.com.hk/*"));
-  set2.reset(new ExtensionPermissionSet(empty_perms, elist2, slist2));
+  set2 = new ExtensionPermissionSet(empty_perms, elist2, slist2);
   EXPECT_FALSE(set1->HasLessHostPrivilegesThan(set2.get()));
   EXPECT_FALSE(set2->HasLessHostPrivilegesThan(set1.get()));
 
   // Test that subdomain wildcards are handled properly.
   elist2.ClearPatterns();
   elist2.AddPattern(
       URLPattern(URLPattern::SCHEME_HTTP, "http://*.google.com.hk/*"));
-  set2.reset(new ExtensionPermissionSet(empty_perms, elist2, slist2));
+  set2 = new ExtensionPermissionSet(empty_perms, elist2, slist2);
   EXPECT_TRUE(set1->HasLessHostPrivilegesThan(set2.get()));
   //TODO(jstritar): Does not match subdomains properly. http://crbug.com/65337
   //EXPECT_FALSE(set2->HasLessHostPrivilegesThan(set1.get()));
 
   // Test that different domains count as different hosts.
   elist2.ClearPatterns();
   elist2.AddPattern(
       URLPattern(URLPattern::SCHEME_HTTP, "http://www.google.com/path"));
   elist2.AddPattern(
       URLPattern(URLPattern::SCHEME_HTTP, "http://www.example.org/path"));
-  set2.reset(new ExtensionPermissionSet(empty_perms, elist2, slist2));
+  set2 = new ExtensionPermissionSet(empty_perms, elist2, slist2);
   EXPECT_TRUE(set1->HasLessHostPrivilegesThan(set2.get()));
   EXPECT_FALSE(set2->HasLessHostPrivilegesThan(set1.get()));
 
   // Test that different subdomains count as different hosts.
   elist2.ClearPatterns();
   elist2.AddPattern(
       URLPattern(URLPattern::SCHEME_HTTP, "http://mail.google.com/*"));
-  set2.reset(new ExtensionPermissionSet(empty_perms, elist2, slist2));
+  set2 = new ExtensionPermissionSet(empty_perms, elist2, slist2);
   EXPECT_TRUE(set1->HasLessHostPrivilegesThan(set2.get()));
   EXPECT_TRUE(set2->HasLessHostPrivilegesThan(set1.get()));
 }
 
 TEST(ExtensionPermissionSetTest, GetAPIsAsStrings) {
   ExtensionAPIPermissionSet apis;
   URLPatternSet empty_set;
 
   apis.insert(ExtensionAPIPermission::kProxy);
   apis.insert(ExtensionAPIPermission::kBackground);
   apis.insert(ExtensionAPIPermission::kNotification);
   apis.insert(ExtensionAPIPermission::kTab);
 
-  ExtensionPermissionSet perm_set(apis, empty_set, empty_set);
-  std::set<std::string> api_names = perm_set.GetAPIsAsStrings();
+  scoped_refptr<ExtensionPermissionSet> perm_set = new ExtensionPermissionSet(
+      apis, empty_set, empty_set);
+  std::set<std::string> api_names = perm_set->GetAPIsAsStrings();
 
   // The result is correct if it has the same number of elements
   // and we can convert it back to the id set.
   EXPECT_EQ(4u, api_names.size());
   EXPECT_EQ(apis,
             ExtensionPermissionsInfo::GetInstance()->GetAllByName(api_names));
 }
 
 TEST(ExtensionPermissionSetTest, IsEmpty) {
   ExtensionAPIPermissionSet empty_apis;
   URLPatternSet empty_extent;
 
-  ExtensionPermissionSet perm_set;
-  EXPECT_TRUE(perm_set.IsEmpty());
+  scoped_refptr<ExtensionPermissionSet> empty = new ExtensionPermissionSet();
+  EXPECT_TRUE(empty->IsEmpty());
+  scoped_refptr<ExtensionPermissionSet> perm_set;
 
-  perm_set = ExtensionPermissionSet(empty_apis, empty_extent, empty_extent);
-  EXPECT_TRUE(perm_set.IsEmpty());
+  perm_set = new ExtensionPermissionSet(empty_apis, empty_extent, empty_extent);
+  EXPECT_TRUE(perm_set->IsEmpty());
 
   ExtensionAPIPermissionSet non_empty_apis;
   non_empty_apis.insert(ExtensionAPIPermission::kBackground);
-  perm_set = ExtensionPermissionSet(
+  perm_set = new ExtensionPermissionSet(
       non_empty_apis, empty_extent, empty_extent);
-  EXPECT_FALSE(perm_set.IsEmpty());
+  EXPECT_FALSE(perm_set->IsEmpty());
 
   // Try non standard host
   URLPatternSet non_empty_extent;
   AddPattern(&non_empty_extent, "http://www.google.com/*");
 
-  perm_set = ExtensionPermissionSet(
+  perm_set = new ExtensionPermissionSet(
       empty_apis, non_empty_extent, empty_extent);
-  EXPECT_FALSE(perm_set.IsEmpty());
+  EXPECT_FALSE(perm_set->IsEmpty());
 
-  perm_set = ExtensionPermissionSet(
+  perm_set = new ExtensionPermissionSet(
       empty_apis, empty_extent, non_empty_extent);
-  EXPECT_FALSE(perm_set.IsEmpty());
+  EXPECT_FALSE(perm_set->IsEmpty());
 }