Make ActiveTabPermissionManager also grant the tabs permission.

chrome/browser/extensions/active_tab_permission_manager.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_manager.h"
 
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/session_id.h"
@@ skipping 31 matching lines @@
   if (IsGranted(extension))
     return;
 
   URLPattern pattern(UserScript::kValidUserScriptSchemes);
   if (pattern.Parse(web_contents()->GetURL().spec()) !=
           URLPattern::PARSE_SUCCESS) {
     // Pattern parsing could fail if this is an unsupported URL e.g. chrome://.
     return;
   }
 
-  URLPatternSet new_permissions;
-  const URLPatternSet* old_permissions =
-      extension->GetTabSpecificHostPermissions(tab_id_);
-  if (old_permissions)
-    new_permissions.AddPatterns(*old_permissions);
+  APIPermissionSet new_apis;
+  new_apis.insert(APIPermission::kTab);
+  URLPatternSet new_hosts;
+  new_hosts.AddPattern(pattern);
 
-  new_permissions.AddPattern(pattern);
+  extension->UpdateTabSpecificPermissions(
+      tab_id_, new PermissionSet(new_apis, new_hosts, URLPatternSet()));
   granted_extensions_.Insert(extension);
-  extension->SetTabSpecificHostPermissions(tab_id_, new_permissions);
   Send(new ExtensionMsg_UpdateTabSpecificPermissions(GetPageID(),
                                                      tab_id_,
                                                      extension->id(),
-                                                     new_permissions));
+                                                     new_hosts));
 }
 
 bool ActiveTabPermissionManager::IsGranted(const Extension* extension) {
   return granted_extensions_.Contains(extension->id());
 }
 
 void ActiveTabPermissionManager::DidNavigateMainFrame(
     const content::LoadCommittedDetails& details,
     const content::FrameNavigateParams& params) {
   if (details.is_in_page)
@@ skipping 20 matching lines @@
 }
 
 void ActiveTabPermissionManager::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) {
-    (*it)->ClearTabSpecificHostPermissions(tab_id_);
+    (*it)->ClearTabSpecificPermissions(tab_id_);
     extension_ids.push_back((*it)->id());
   }
 
   Send(new ExtensionMsg_ClearTabSpecificPermissions(tab_id_, extension_ids));
   granted_extensions_.Clear();
 }
 
 int32 ActiveTabPermissionManager::GetPageID() {
   return web_contents()->GetController().GetActiveEntry()->GetPageID();
 }
 
 }  // namespace extensions