[Extensions] Propagate activeTab hosts to extension background pages

extensions/common/permissions/permissions_data.cc

 // Copyright (c) 2013 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 "extensions/common/permissions/permissions_data.h"
 
 #include "base/command_line.h"
 #include "content/public/common/url_constants.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/error_utils.h"
@@ skipping 152 matching lines @@
   base::AutoLock auto_lock(runtime_lock_);
   return tab_permissions.get() && tab_permissions->HasAPIPermission(permission);
 }
 
 bool PermissionsData::CheckAPIPermissionWithParam(
     APIPermission::ID permission,
     const APIPermission::CheckParam* param) const {
   return active_permissions()->CheckAPIPermissionWithParam(permission, param);
 }
 
-const URLPatternSet& PermissionsData::GetEffectiveHostPermissions() const {
-  return active_permissions()->effective_hosts();
+URLPatternSet PermissionsData::GetEffectiveHostPermissions() const {
+  base::AutoLock auto_lock(runtime_lock_);
+  URLPatternSet effective_hosts = active_permissions_unsafe_->effective_hosts();
+  for (const auto& val : tab_specific_permissions_)
+    effective_hosts.AddPatterns(val.second->effective_hosts());
+  return effective_hosts;
 }
 
 bool PermissionsData::HasHostPermission(const GURL& url) const {
   return active_permissions()->HasExplicitAccessToOrigin(url);
 }
 
 bool PermissionsData::HasEffectiveAccessToAllHosts() const {
   return active_permissions()->HasEffectiveAccessToAllHosts();
 }
 
@@ skipping 175 matching lines @@
     return ACCESS_WITHHELD;
 
   if (error) {
     *error = ErrorUtils::FormatErrorMessage(manifest_errors::kCannotAccessPage,
                                             document_url.spec());
   }
   return ACCESS_DENIED;
 }
 
 }  // namespace extensions