Allow declarative webrequest and webrequest in extensions.

extensions/browser/api/declarative/declarative_api.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 "extensions/browser/api/declarative/declarative_api.h"
 
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/task_runner_util.h"
 #include "base/values.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
+#include "extensions/browser/api/declarative/rules_registry_service.h"
 #include "extensions/browser/api/extensions_api_client.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/guest_view/web_view/web_view_constants.h"
 #include "extensions/browser/guest_view/web_view/web_view_guest.h"
 #include "extensions/common/api/events.h"
 #include "extensions/common/extension_api.h"
 #include "extensions/common/permissions/permissions_data.h"
 
 using extensions::core_api::events::Rule;
 
@@ skipping 120 matching lines @@
   if (has_webview != IsWebViewEvent(event_name))
     EXTENSION_FUNCTION_ERROR(kWebViewExpectedError);
   event_name = GetWebRequestEventName(event_name);
 
   // If we are not operating on a particular <webview>, then the key is (0, 0).
   RulesRegistry::WebViewKey key(
       webview_instance_id ? embedder_process_id : 0, webview_instance_id);
 
   // The following call will return a NULL pointer for apps_shell, but should
   // never be called there anyways.
-  rules_registry_ = ExtensionsAPIClient::Get()->GetRulesRegistry(
-      browser_context(), key, event_name);
+  rules_registry_ = RulesRegistryService::Get(browser_context())->
+            GetRulesRegistry(key, event_name);
   DCHECK(rules_registry_.get());
   // Raw access to this function is not available to extensions, therefore
   // there should never be a request for a nonexisting rules registry.
   EXTENSION_FUNCTION_VALIDATE(rules_registry_.get());
 
   if (content::BrowserThread::CurrentlyOn(rules_registry_->owner_thread())) {
     bool success = RunAsyncOnCorrectThread();
     SendResponse(success);
   } else {
     scoped_refptr<base::MessageLoopProxy> message_loop_proxy =
@@ skipping 47 matching lines @@
   } else {
     rules_registry_->GetAllRules(extension_id(), &rules);
   }
 
   results_ = GetRules::Results::Create(rules);
 
   return true;
 }
 
 }  // namespace extensions