Refactor and fix declarative webRequest API permissions

chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry.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_RULES_REGISTRY_H_
 #define CHROME_BROWSER_EXTENSIONS_API_DECLARATIVE_WEBREQUEST_WEBREQUEST_RULES_REGISTRY_H_
 
 #include <list>
 #include <map>
 #include <set>
 #include <vector>
 
 #include "base/time.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/ref_counted.h"
 #include "chrome/browser/extensions/api/declarative/rules_registry_with_cache.h"
 #include "chrome/browser/extensions/api/declarative_webrequest/request_stages.h"
 #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_rule.h"
 #include "chrome/browser/extensions/extension_info_map.h"
 #include "chrome/common/extensions/matcher/url_matcher.h"
 
 class Profile;
+class WebRequestPermissions;
 
 namespace extension_web_request_api_helpers {
 struct EventResponseDelta;
 }
 
 namespace net {
 class URLRequest;
 }
 
 namespace extensions {
@@ skipping 36 matching lines @@
   // a way to also execute the actions of the rules.
   std::set<WebRequestRule::GlobalRuleId> GetMatches(
       net::URLRequest* request,
       RequestStages request_stage);
 
   // Returns which modifications should be executed on the network request
   // according to the rules registered in this registry.
   std::list<LinkedPtrEventResponseDelta> CreateDeltas(
       const ExtensionInfoMap* extension_info_map,
       net::URLRequest* request,
+      bool crosses_incognito,
       RequestStages request_stage,
       const WebRequestRule::OptionalRequestData& optional_request_data);
 
   // Implementation of RulesRegistryWithCache:
   virtual std::string AddRulesImpl(
       const std::string& extension_id,
       const std::vector<linked_ptr<RulesRegistry::Rule> >& rules) OVERRIDE;
   virtual std::string RemoveRulesImpl(
       const std::string& extension_id,
       const std::vector<std::string>& rule_identifiers) OVERRIDE;
@@ skipping 21 matching lines @@
   RulesMap webrequest_rules_;
 
   URLMatcher url_matcher_;
 
   scoped_refptr<ExtensionInfoMap> extension_info_map_;
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_DECLARATIVE_WEBREQUEST_WEBREQUEST_RULES_REGISTRY_H_