| Index: extensions/browser/extension_protocols.cc
|
| diff --git a/extensions/browser/extension_protocols.cc b/extensions/browser/extension_protocols.cc
|
| index 57dfe158a5d00e71a7e7effcf76c6d2125c54486..2ef8711648fc56948ed39f05053fff871bb8b578 100644
|
| --- a/extensions/browser/extension_protocols.cc
|
| +++ b/extensions/browser/extension_protocols.cc
|
| @@ -221,7 +221,7 @@ class URLRequestExtensionJob : public net::URLRequestFileJob {
|
| std::string range_header;
|
| if (headers.GetHeader(net::HttpRequestHeaders::kRange, &range_header)) {
|
| if (verify_job_.get())
|
| - verify_job_ = NULL;
|
| + verify_job_ = nullptr;
|
| }
|
| URLRequestFileJob::SetExtraRequestHeaders(headers);
|
| }
|
| @@ -232,7 +232,7 @@ class URLRequestExtensionJob : public net::URLRequestFileJob {
|
| // TODO(asargent) - we'll need to add proper support for range headers.
|
| // crbug.com/369895.
|
| if (result > 0 && verify_job_.get())
|
| - verify_job_ = NULL;
|
| + verify_job_ = nullptr;
|
| }
|
|
|
| virtual void OnReadComplete(net::IOBuffer* buffer, int result) OVERRIDE {
|
| @@ -418,7 +418,7 @@ ExtensionProtocolHandler::MaybeCreateJob(
|
| directory_path = disabled_extension->path();
|
| if (directory_path.value().empty()) {
|
| LOG(WARNING) << "Failed to GetPathForExtension: " << extension_id;
|
| - return NULL;
|
| + return nullptr;
|
| }
|
| }
|
|
|
| @@ -506,10 +506,10 @@ ExtensionProtocolHandler::MaybeCreateJob(
|
| extension_id = new_extension_id;
|
| relative_path = base::FilePath::FromUTF8Unsafe(new_relative_path);
|
| } else {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
| }
|
| - ContentVerifyJob* verify_job = NULL;
|
| + ContentVerifyJob* verify_job = nullptr;
|
| ContentVerifier* verifier = extension_info_map_->content_verifier();
|
| if (verifier) {
|
| verify_job =
|
|
|