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

Side by Side Diff: extensions/browser/api/declarative/rules_registry_service.cc

Issue 1902873002: Convert //extensions/browser/api from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "extensions/browser/api/declarative/rules_registry_service.h" 5 #include "extensions/browser/api/declarative/rules_registry_service.h"
6 6
7 #include <memory>
8
7 #include "base/bind.h" 9 #include "base/bind.h"
8 #include "base/lazy_instance.h" 10 #include "base/lazy_instance.h"
9 #include "base/logging.h" 11 #include "base/logging.h"
10 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/ptr_util.h"
11 #include "content/public/browser/browser_thread.h" 13 #include "content/public/browser/browser_thread.h"
12 #include "content/public/browser/render_process_host.h" 14 #include "content/public/browser/render_process_host.h"
13 #include "extensions/browser/api/declarative/rules_cache_delegate.h" 15 #include "extensions/browser/api/declarative/rules_cache_delegate.h"
14 #include "extensions/browser/api/declarative_content/content_rules_registry.h" 16 #include "extensions/browser/api/declarative_content/content_rules_registry.h"
15 #include "extensions/browser/api/declarative_webrequest/webrequest_constants.h" 17 #include "extensions/browser/api/declarative_webrequest/webrequest_constants.h"
16 #include "extensions/browser/api/declarative_webrequest/webrequest_rules_registr y.h" 18 #include "extensions/browser/api/declarative_webrequest/webrequest_rules_registr y.h"
17 #include "extensions/browser/api/extensions_api_client.h" 19 #include "extensions/browser/api/extensions_api_client.h"
18 #include "extensions/browser/api/web_request/web_request_api.h" 20 #include "extensions/browser/api/web_request/web_request_api.h"
19 #include "extensions/browser/extension_registry.h" 21 #include "extensions/browser/extension_registry.h"
20 #include "extensions/common/extension.h" 22 #include "extensions/common/extension.h"
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 // installed the default registries. 73 // installed the default registries.
72 if (ContainsKey(rule_registries_, key)) 74 if (ContainsKey(rule_registries_, key))
73 return; 75 return;
74 76
75 // Only cache rules for regular pages. 77 // Only cache rules for regular pages.
76 RulesCacheDelegate* web_request_cache_delegate = NULL; 78 RulesCacheDelegate* web_request_cache_delegate = NULL;
77 if (rules_registry_id == kDefaultRulesRegistryID) { 79 if (rules_registry_id == kDefaultRulesRegistryID) {
78 // Create a RulesCacheDelegate. 80 // Create a RulesCacheDelegate.
79 web_request_cache_delegate = 81 web_request_cache_delegate =
80 new RulesCacheDelegate(true /*log_storage_init_delay*/); 82 new RulesCacheDelegate(true /*log_storage_init_delay*/);
81 cache_delegates_.push_back(make_scoped_ptr(web_request_cache_delegate)); 83 cache_delegates_.push_back(base::WrapUnique(web_request_cache_delegate));
82 } 84 }
83 scoped_refptr<WebRequestRulesRegistry> web_request_rules_registry( 85 scoped_refptr<WebRequestRulesRegistry> web_request_rules_registry(
84 new WebRequestRulesRegistry(browser_context_, web_request_cache_delegate, 86 new WebRequestRulesRegistry(browser_context_, web_request_cache_delegate,
85 rules_registry_id)); 87 rules_registry_id));
86 88
87 RegisterRulesRegistry(web_request_rules_registry); 89 RegisterRulesRegistry(web_request_rules_registry);
88 content::BrowserThread::PostTask( 90 content::BrowserThread::PostTask(
89 content::BrowserThread::IO, FROM_HERE, 91 content::BrowserThread::IO, FROM_HERE,
90 base::Bind(&RegisterToExtensionWebRequestEventRouterOnIO, 92 base::Bind(&RegisterToExtensionWebRequestEventRouterOnIO,
91 browser_context_, rules_registry_id, 93 browser_context_, rules_registry_id,
92 web_request_rules_registry)); 94 web_request_rules_registry));
93 95
94 // Only create a ContentRulesRegistry for regular pages. 96 // Only create a ContentRulesRegistry for regular pages.
95 if (rules_registry_id == kDefaultRulesRegistryID) { 97 if (rules_registry_id == kDefaultRulesRegistryID) {
96 RulesCacheDelegate* content_rules_cache_delegate = 98 RulesCacheDelegate* content_rules_cache_delegate =
97 new RulesCacheDelegate(false /*log_storage_init_delay*/); 99 new RulesCacheDelegate(false /*log_storage_init_delay*/);
98 cache_delegates_.push_back(make_scoped_ptr(content_rules_cache_delegate)); 100 cache_delegates_.push_back(base::WrapUnique(content_rules_cache_delegate));
99 scoped_refptr<ContentRulesRegistry> content_rules_registry = 101 scoped_refptr<ContentRulesRegistry> content_rules_registry =
100 ExtensionsAPIClient::Get()->CreateContentRulesRegistry( 102 ExtensionsAPIClient::Get()->CreateContentRulesRegistry(
101 browser_context_, content_rules_cache_delegate); 103 browser_context_, content_rules_cache_delegate);
102 if (content_rules_registry.get() != nullptr) { 104 if (content_rules_registry.get() != nullptr) {
103 RegisterRulesRegistry(content_rules_registry); 105 RegisterRulesRegistry(content_rules_registry);
104 content_rules_registry_ = content_rules_registry.get(); 106 content_rules_registry_ = content_rules_registry.get();
105 } 107 }
106 } 108 }
107 } 109 }
108 110
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 } 220 }
219 221
220 void RulesRegistryService::OnExtensionUninstalled( 222 void RulesRegistryService::OnExtensionUninstalled(
221 content::BrowserContext* browser_context, 223 content::BrowserContext* browser_context,
222 const Extension* extension, 224 const Extension* extension,
223 extensions::UninstallReason reason) { 225 extensions::UninstallReason reason) {
224 NotifyRegistriesHelper(&RulesRegistry::OnExtensionUninstalled, extension); 226 NotifyRegistriesHelper(&RulesRegistry::OnExtensionUninstalled, extension);
225 } 227 }
226 228
227 } // namespace extensions 229 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698