Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7825)

Unified Diff: chrome/test/base/testing_browser_process.cc

Issue 2731283009: Swap ownership of RulesetService and the content delegate (Closed)
Patch Set: Swap ownership of RulesetService and the content delegate Created 3 years, 9 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
Index: chrome/test/base/testing_browser_process.cc
diff --git a/chrome/test/base/testing_browser_process.cc b/chrome/test/base/testing_browser_process.cc
index c2980ebe2142e780eb3937bd438cc22b3c9e1e2a..b51bfaf24f0cbe31c38d7ad6042f96efcf9d054a 100644
--- a/chrome/test/base/testing_browser_process.cc
+++ b/chrome/test/base/testing_browser_process.cc
@@ -24,7 +24,7 @@
#include "components/network_time/network_time_tracker.h"
#include "components/policy/core/browser/browser_policy_connector.h"
#include "components/prefs/pref_service.h"
-#include "components/subresource_filter/core/browser/ruleset_service.h"
+#include "components/subresource_filter/content/browser/content_ruleset_service_delegate.h"
#include "content/public/browser/notification_service.h"
#include "extensions/features/features.h"
#include "media/media_features.h"
@@ -222,9 +222,9 @@ TestingBrowserProcess::safe_browsing_detection_service() {
return nullptr;
}
-subresource_filter::RulesetService*
-TestingBrowserProcess::subresource_filter_ruleset_service() {
- return subresource_filter_ruleset_service_.get();
+subresource_filter::ContentRulesetServiceDelegate*
+TestingBrowserProcess::subresource_filter_ruleset_service_delegate() {
+ return subresource_filter_ruleset_service_delegate_.get();
}
net::URLRequestContextGetter* TestingBrowserProcess::system_request_context() {
@@ -461,8 +461,9 @@ void TestingBrowserProcess::SetSafeBrowsingService(
}
void TestingBrowserProcess::SetRulesetService(
- std::unique_ptr<subresource_filter::RulesetService> ruleset_service) {
- subresource_filter_ruleset_service_.swap(ruleset_service);
+ std::unique_ptr<subresource_filter::ContentRulesetServiceDelegate>
+ ruleset_service_delegate) {
+ subresource_filter_ruleset_service_delegate_.swap(ruleset_service_delegate);
}
void TestingBrowserProcess::SetRapporServiceImpl(

Powered by Google App Engine
This is Rietveld 408576698