extensions/browser/api/declarative/rules_registry_service.cc - Issue 590573002: Remove ContentRulesRegistry dependence from RulesRegistryService.

Unified Diff: extensions/browser/api/declarative/rules_registry_service.cc

Issue 590573002: Remove ContentRulesRegistry dependence from RulesRegistryService. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Introduce ChromeContentRulesRegistry, move rules_registry_service.* Created 6 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « extensions/browser/api/declarative/rules_registry_service.h ('k') | extensions/browser/api/declarative_content/content_rules_registry.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: extensions/browser/api/declarative/rules_registry_service.cc

diff --git a/chrome/browser/extensions/api/declarative/rules_registry_service.cc b/extensions/browser/api/declarative/rules_registry_service.cc

similarity index 95%

rename from chrome/browser/extensions/api/declarative/rules_registry_service.cc

rename to extensions/browser/api/declarative/rules_registry_service.cc

index 3974b3d2e7e9d680f79c6032eb1807f6cfb9bf1a..928fd43113f9f99010c43a2ba1ad7f0b9099ba22 100644

--- a/chrome/browser/extensions/api/declarative/rules_registry_service.cc

+++ b/extensions/browser/api/declarative/rules_registry_service.cc

@@ -2,13 +2,12 @@

// 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 "extensions/browser/api/declarative/rules_registry_service.h"

#include "base/bind.h"

#include "base/lazy_instance.h"

#include "base/logging.h"

#include "base/memory/scoped_ptr.h"

-#include "chrome/browser/extensions/api/declarative_content/content_rules_registry.h"

#include "content/public/browser/browser_thread.h"

#include "content/public/browser/notification_details.h"

#include "content/public/browser/notification_service.h"

@@ -16,8 +15,10 @@

#include "content/public/browser/notification_types.h"

#include "content/public/browser/render_process_host.h"

#include "extensions/browser/api/declarative/rules_cache_delegate.h"

+#include "extensions/browser/api/declarative_content/content_rules_registry.h"

#include "extensions/browser/api/declarative_webrequest/webrequest_constants.h"

#include "extensions/browser/api/declarative_webrequest/webrequest_rules_registry.h"

+#include "extensions/browser/api/extensions_api_client.h"

#include "extensions/browser/api/web_request/web_request_api.h"

#include "extensions/browser/extension_registry.h"

#include "extensions/common/extension.h"

@@ -91,9 +92,9 @@ void RulesRegistryService::EnsureDefaultRulesRegistriesRegistered(

RulesCacheDelegate* content_rules_cache_delegate =

new RulesCacheDelegate(false /*log_storage_init_delay*/);

cache_delegates_.push_back(content_rules_cache_delegate);

- scoped_refptr<ContentRulesRegistry> content_rules_registry(

- new ContentRulesRegistry(browser_context_,

- content_rules_cache_delegate));

+ scoped_refptr<ContentRulesRegistry> content_rules_registry =

+ ExtensionsAPIClient::Get()->GetContentRulesRegistry(

Fady Samuel 2014/09/23 15:04:50 nit: Could we please rename this CreateContentRule

wjmaclean 2014/09/23 15:19:04 Sure, good point! Done.

+ browser_context_, content_rules_cache_delegate);

RegisterRulesRegistry(content_rules_registry);

content_rules_registry_ = content_rules_registry.get();

}