<webview>: Implement declarativeWebRequest API

chrome/browser/extensions/api/web_request/web_request_api.h

Index: chrome/browser/extensions/api/web_request/web_request_api.h
diff --git a/chrome/browser/extensions/api/web_request/web_request_api.h b/chrome/browser/extensions/api/web_request/web_request_api.h
index 15c985bee3154aaa70d8e830ab57acdcb5874ec4..47c3c8019008d44385bf9cc0a06953916f7cf4a8 100644
--- a/chrome/browser/extensions/api/web_request/web_request_api.h
+++ b/chrome/browser/extensions/api/web_request/web_request_api.h
@@ -14,6 +14,7 @@
 #include "base/memory/singleton.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time/time.h"
+#include "chrome/browser/extensions/api/declarative/rules_registry_service.h"
 #include "chrome/browser/extensions/api/declarative_webrequest/request_stage.h"
 #include "chrome/browser/extensions/api/web_request/web_request_api_helpers.h"
 #include "chrome/browser/extensions/api/web_request/web_request_permissions.h"
@@ -139,6 +140,7 @@ class ExtensionWebRequestEventRouter
   // the rule registry for |profile|.
   void RegisterRulesRegistry(
       void* profile,
+      const extensions::RulesRegistryService::WebViewKey& webview_key,
       scoped_refptr<extensions::WebRequestRulesRegistry> rules_registry);
 
   // Dispatches the OnBeforeRequest event to any extensions whose filters match
@@ -422,9 +424,11 @@ class ExtensionWebRequestEventRouter
 
   CallbacksForPageLoad callbacks_for_page_load_;
 
+  typedef std::pair<void*, extensions::RulesRegistryService::WebViewKey>
+      RulesRegistryKey;
   // Maps each profile (and OTRProfile) to its respective rules registry.

[vabr (Chromium), 2013/10/25 20:40:24]

Please also update this comment. Now it's matching a profile and a webview key
to a registry.

[Fady Samuel, 2013/10/25 22:48:08]

Done.

-  std::map<void*, scoped_refptr<extensions::WebRequestRulesRegistry> >
-      rules_registries_;
+  std::map<RulesRegistryKey,
+      scoped_refptr<extensions::WebRequestRulesRegistry> > rules_registries_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionWebRequestEventRouter);
 };