Index: extensions/browser/api/declarative_webrequest/webrequest_condition.cc |
diff --git a/extensions/browser/api/declarative_webrequest/webrequest_condition.cc b/extensions/browser/api/declarative_webrequest/webrequest_condition.cc |
index 28c28ce7d54311da583f4fb9ff350d3b53269e89..853c96778f5d7fae051a721a9dfcb9da6ea2abe5 100644 |
--- a/extensions/browser/api/declarative_webrequest/webrequest_condition.cc |
+++ b/extensions/browser/api/declarative_webrequest/webrequest_condition.cc |
@@ -46,9 +46,8 @@ namespace keys = declarative_webrequest_constants; |
// |
WebRequestData::WebRequestData(net::URLRequest* request, RequestStage stage) |
- : request(request), |
- stage(stage), |
- original_response_headers(NULL) {} |
+ : request(request), stage(stage), original_response_headers(nullptr) { |
+} |
WebRequestData::WebRequestData( |
net::URLRequest* request, |
@@ -130,7 +129,7 @@ scoped_ptr<WebRequestCondition> WebRequestCondition::Create( |
URLMatcherConditionFactory* url_matcher_condition_factory, |
const base::Value& condition, |
std::string* error) { |
- const base::DictionaryValue* condition_dict = NULL; |
+ const base::DictionaryValue* condition_dict = nullptr; |
if (!condition.GetAsDictionary(&condition_dict)) { |
*error = kExpectedDictionary; |
return scoped_ptr<WebRequestCondition>(); |
@@ -160,7 +159,7 @@ scoped_ptr<WebRequestCondition> WebRequestCondition::Create( |
// Skip this. |
} else if (name_is_url || |
condition_attribute_name == keys::kFirstPartyForCookiesUrlKey) { |
- const base::DictionaryValue* dict = NULL; |
+ const base::DictionaryValue* dict = nullptr; |
if (!condition_attribute_value.GetAsDictionary(&dict)) { |
*error = base::StringPrintf(kInvalidTypeOfParamter, |
condition_attribute_name.c_str()); |