Reland: chrome.webRequest support for ExtensionSettings

extensions/browser/api/declarative_webrequest/webrequest_action.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 "extensions/browser/api/declarative_webrequest/webrequest_action.h"
 
 #include <limits>
 #include <utility>
 
 #include "base/lazy_instance.h"
@@ skipping 498 matching lines @@
     case STRATEGY_NONE:
       permission_check = WebRequestPermissions::DO_NOT_CHECK_HOST;
       break;
     case STRATEGY_HOST:
       permission_check = WebRequestPermissions::REQUIRE_HOST_PERMISSION;
       break;
   }
   // TODO(devlin): Pass in the real tab id here.
   return WebRequestPermissions::CanExtensionAccessURL(
              extension_info_map, extension_id, request->url(), -1,
-             apply_info->crosses_incognito,
-             permission_check) == PermissionsData::ACCESS_ALLOWED;
+             apply_info->crosses_incognito, permission_check,
+             request->initiator()) == PermissionsData::ACCESS_ALLOWED;
 }
 
 // static
 scoped_refptr<const WebRequestAction> WebRequestAction::Create(
     content::BrowserContext* browser_context,
     const Extension* extension,
     const base::Value& json_action,
     std::string* error,
     bool* bad_message) {
   *error = "";
@@ skipping 631 matching lines @@
     const base::Time& extension_install_time) const {
   CHECK(request_data.stage & stages());
   LinkedPtrEventResponseDelta result(
       new extension_web_request_api_helpers::EventResponseDelta(
           extension_id, extension_install_time));
   result->messages_to_extension.insert(message_);
   return result;
 }
 
 }  // namespace extensions