| Index: extensions/browser/event_listener_map.cc
|
| diff --git a/extensions/browser/event_listener_map.cc b/extensions/browser/event_listener_map.cc
|
| index d6e7d2d80094e29f6209b21c98abfb42852ca5c5..bda54e01b242c816a00f4c5ac258b0ea38fdf9d1 100644
|
| --- a/extensions/browser/event_listener_map.cc
|
| +++ b/extensions/browser/event_listener_map.cc
|
| @@ -62,11 +62,11 @@ bool EventListener::IsLazy() const {
|
| }
|
|
|
| void EventListener::MakeLazy() {
|
| - process_ = NULL;
|
| + process_ = nullptr;
|
| }
|
|
|
| content::BrowserContext* EventListener::GetBrowserContext() const {
|
| - return process_ ? process_->GetBrowserContext() : NULL;
|
| + return process_ ? process_->GetBrowserContext() : nullptr;
|
| }
|
|
|
| EventListener::EventListener(const std::string& event_name,
|
| @@ -198,7 +198,7 @@ void EventListenerMap::LoadUnfilteredLazyListeners(
|
| for (std::set<std::string>::const_iterator it = event_names.begin();
|
| it != event_names.end(); ++it) {
|
| AddListener(EventListener::ForExtension(
|
| - *it, extension_id, NULL, scoped_ptr<DictionaryValue>()));
|
| + *it, extension_id, nullptr, scoped_ptr<DictionaryValue>()));
|
| }
|
| }
|
|
|
| @@ -207,15 +207,18 @@ void EventListenerMap::LoadFilteredLazyListeners(
|
| const DictionaryValue& filtered) {
|
| for (DictionaryValue::Iterator it(filtered); !it.IsAtEnd(); it.Advance()) {
|
| // We skip entries if they are malformed.
|
| - const base::ListValue* filter_list = NULL;
|
| + const base::ListValue* filter_list = nullptr;
|
| if (!it.value().GetAsList(&filter_list))
|
| continue;
|
| for (size_t i = 0; i < filter_list->GetSize(); i++) {
|
| - const DictionaryValue* filter = NULL;
|
| + const DictionaryValue* filter = nullptr;
|
| if (!filter_list->GetDictionary(i, &filter))
|
| continue;
|
| - AddListener(EventListener::ForExtension(
|
| - it.key(), extension_id, NULL, make_scoped_ptr(filter->DeepCopy())));
|
| + AddListener(
|
| + EventListener::ForExtension(it.key(),
|
| + extension_id,
|
| + nullptr,
|
| + make_scoped_ptr(filter->DeepCopy())));
|
| }
|
| }
|
| }
|
|
|