Refactor and fix declarative webRequest API permissions

chrome/browser/extensions/api/declarative_webrequest/webrequest_rule.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/api/declarative_webrequest/webrequest_rule.h"
 
 #include "base/logging.h"
 #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_action.h"
 #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_condition.h"
 #include "chrome/browser/extensions/api/web_request/web_request_api_helpers.h"
+#include "chrome/browser/extensions/api/web_request/web_request_permissions.h"
+#include "chrome/browser/extensions/extension_info_map.h"
 #include "chrome/common/extensions/extension.h"
 
 namespace {
 const char kInvalidActionDatatype[] = "An action of a rule set had an invalid "
     "structure that should have been caught by the JSON validator.";
 }  // namespace
 
 namespace extensions {
 
 WebRequestRule::WebRequestRule(
@@ skipping 59 matching lines @@
   CHECK(rule->priority.get());
   int priority = *(rule->priority);
 
   GlobalRuleId rule_id(extension_id, *(rule->id));
   return scoped_ptr<WebRequestRule>(
       new WebRequestRule(rule_id, extension_installation_time,
                          conditions.Pass(), actions.Pass(), priority));
 }
 
 std::list<LinkedPtrEventResponseDelta> WebRequestRule::CreateDeltas(
-    const extensions::Extension* extension,
+    const ExtensionInfoMap* extension_info_map,
     net::URLRequest* request,
+    bool crosses_incognito,
     RequestStages request_stage,
     const OptionalRequestData& optional_request_data) const {
-  return actions_->CreateDeltas(extension, request, request_stage,
-      optional_request_data, id_.first, extension_installation_time_);
+  return actions_->CreateDeltas(extension_info_map, extension_id(), request,
+      crosses_incognito, request_stage, optional_request_data,
+      extension_installation_time_);
 }
 
 int WebRequestRule::GetMinimumPriority() const {
   return actions_->GetMinimumPriority();
 }
 
 }  // namespace extensions