Refactor and fix declarative webRequest API permissions

chrome/browser/extensions/api/declarative/rules_registry_service.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/rules_registry_service.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "chrome/browser/extensions/api/declarative/initializing_rules_registry.h"
 #include "chrome/browser/extensions/api/declarative/rules_registry_storage_delegate.h"
 #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_constants.h"
 #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry.h"
 #include "chrome/browser/extensions/api/web_request/web_request_api.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 
 namespace extensions {
 
 namespace {
 
 // Returns the key to use for storing declarative rules in the state store.
-std::string GetDeclarativeRuleStorageKey(const std::string& event_name) {
-  return "declarative_rules." + event_name;
+std::string GetDeclarativeRuleStorageKey(const std::string& event_name,
+                                         bool incognito) {
+  if (incognito)
+    return "declarative_rules.incognito." + event_name;
+  else
+    return "declarative_rules." + event_name;
 }
 
 // Registers |web_request_rules_registry| on the IO thread.
 void RegisterToExtensionWebRequestEventRouterOnIO(
+    void* profile,
     scoped_refptr<WebRequestRulesRegistry> web_request_rules_registry) {
   ExtensionWebRequestEventRouter::GetInstance()->RegisterRulesRegistry(
-      web_request_rules_registry);
+      profile, web_request_rules_registry);
 }
 
 }  // namespace
 
 RulesRegistryService::RulesRegistryService(Profile* profile)
     : profile_(profile) {
   if (profile) {
     registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED,
                    content::Source<Profile>(profile));
   }
 }
 
 RulesRegistryService::~RulesRegistryService() {
   for (size_t i = 0; i < delegates_.size(); ++i)
     delegates_[i]->CleanupOnUIThread();
 }
 
-void RulesRegistryService::RegisterDefaultRulesRegistries() {
+void RulesRegistryService::RegisterDefaultRulesRegistries(bool incognito) {

[Matt Perry, 2012/07/25 21:27:56]

The incognito parameter is redundant. You can just check
profile_->IsOffTheRecord()

[battre, 2012/07/26 16:38:43]

Done.

   RulesRegistryStorageDelegate* delegate = new RulesRegistryStorageDelegate();
   scoped_refptr<WebRequestRulesRegistry> web_request_rules_registry(
       new WebRequestRulesRegistry(profile_, delegate));
   delegate->InitOnUIThread(profile_, web_request_rules_registry,
       GetDeclarativeRuleStorageKey(
-          declarative_webrequest_constants::kOnRequest));
+          declarative_webrequest_constants::kOnRequest, incognito));
   delegates_.push_back(delegate);
 
   RegisterRulesRegistry(declarative_webrequest_constants::kOnRequest,
                         web_request_rules_registry);
   content::BrowserThread::PostTask(
       content::BrowserThread::IO, FROM_HERE,
       base::Bind(&RegisterToExtensionWebRequestEventRouterOnIO,
-          web_request_rules_registry));
+          profile_, web_request_rules_registry));
 }
 
 void RulesRegistryService::Shutdown() {
   content::BrowserThread::PostTask(
       content::BrowserThread::IO, FROM_HERE,
       base::Bind(&RegisterToExtensionWebRequestEventRouterOnIO,
-          scoped_refptr<WebRequestRulesRegistry>(NULL)));
+          profile_, scoped_refptr<WebRequestRulesRegistry>(NULL)));
 }
 
 void RulesRegistryService::RegisterRulesRegistry(
     const std::string& event_name,
     scoped_refptr<RulesRegistry> rule_registry) {
   DCHECK(rule_registries_.find(event_name) == rule_registries_.end());
   rule_registries_[event_name] =
       make_scoped_refptr(new InitializingRulesRegistry(rule_registry));
 }
 
@@ skipping 37 matching lines @@
       OnExtensionUnloaded(extension->id());
       break;
     }
     default:
       NOTREACHED();
       break;
   }
 }
 
 }  // namespace extensions