Refactor and fix declarative webRequest API permissions

chrome/browser/extensions/api/declarative_webrequest/webrequest_rule.h

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_API_DECLARATIVE_WEBREQUEST_WEBREQUEST_RULE_H_
 #define CHROME_BROWSER_EXTENSIONS_API_DECLARATIVE_WEBREQUEST_WEBREQUEST_RULE_H_
 
 #include <list>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/time.h"
 #include "chrome/browser/extensions/api/declarative/rules_registry.h"
 #include "chrome/browser/extensions/api/declarative_webrequest/request_stages.h"
 
+class ExtensionInfoMap;
+class WebRequestPermissions;
+
 namespace extensions {
 class Extension;
 class URLMatcherConditionFactory;
+class WebRequestActionSet;
 class WebRequestConditionSet;
-class WebRequestActionSet;
 }
 
 namespace extension_web_request_api_helpers {
 struct EventResponseDelta;
 }
 
 namespace net {
 class HttpResponseHeaders;
 class URLRequest;
 }
@@ skipping 28 matching lines @@
   // If |error| is empty, the translation was successful and the returned
   // rule is internally consistent.
   static scoped_ptr<WebRequestRule> Create(
       URLMatcherConditionFactory* url_matcher_condition_factory,
       const std::string& extension_id,
       base::Time extension_installation_time,
       linked_ptr<RulesRegistry::Rule> rule,
       std::string* error);
 
   const GlobalRuleId& id() const { return id_; }
+  const std::string& extension_id() const { return id_.first; }
   const WebRequestConditionSet& conditions() const { return *conditions_; }
   const WebRequestActionSet& actions() const { return *actions_; }
   Priority priority() const { return priority_; }
 
   // Creates all deltas resulting from the ActionSet. This function should
   // only be called when the conditions_ are fulfilled (from a semantic point
   // of view; no harm is done if this function is called at other times for
   // testing purposes).
   // If |extension| is set, deltas are suppressed if the |extension| does not
   // have have sufficient permissions to modify the |request|. The returned list
   // may be empty in this case.
   std::list<LinkedPtrEventResponseDelta> CreateDeltas(
-      const extensions::Extension* extension,
+      const WebRequestPermissions* permissions,
+      const ExtensionInfoMap* extension_info_map,
       net::URLRequest* request,
+      bool crosses_incognito,
       RequestStages request_stage,
       const OptionalRequestData& optional_request_data) const;
 
   // Returns the minimum priority of rules that may be evaluated after
   // this rule. Defaults to MAX_INT. Only valid if the conditions of this rule
   // are fulfilled.
   Priority GetMinimumPriority() const;
 
  private:
   // Checks whether the set of |conditions| and |actions| are consistent,
   // meaning for example that we do not allow combining an |action| that needs
   // to be executed before the |condition| can be fulfilled.
   // Returns true in case of consistency and MUST set |error| otherwise.
   static bool CheckConsistency(WebRequestConditionSet* conditions,
                                WebRequestActionSet* actions,
                                std::string* error);
 
   GlobalRuleId id_;
   base::Time extension_installation_time_;  // For precedences of rules.
   scoped_ptr<WebRequestConditionSet> conditions_;
   scoped_ptr<WebRequestActionSet> actions_;
   Priority priority_;
 
   DISALLOW_COPY_AND_ASSIGN(WebRequestRule);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_DECLARATIVE_WEBREQUEST_WEBREQUEST_RULE_H_