Commit 1b198fa1 authored by viettrungluu's avatar viettrungluu Committed by Commit bot

Mojo: Convert scoped_ptr<...>() to nullptr in mojo/embedder.

R=jamesr@chromium.org

Review URL: https://codereview.chromium.org/606143003

Cr-Commit-Position: refs/heads/master@{#297093}
parent 6706d602
...@@ -52,7 +52,7 @@ scoped_ptr<PlatformSharedBufferMapping> SimplePlatformSharedBuffer::Map( ...@@ -52,7 +52,7 @@ scoped_ptr<PlatformSharedBufferMapping> SimplePlatformSharedBuffer::Map(
size_t offset, size_t offset,
size_t length) { size_t length) {
if (!IsValidMap(offset, length)) if (!IsValidMap(offset, length))
return scoped_ptr<PlatformSharedBufferMapping>(); return nullptr;
return MapNoCheck(offset, length); return MapNoCheck(offset, length);
} }
......
...@@ -137,7 +137,7 @@ scoped_ptr<PlatformSharedBufferMapping> SimplePlatformSharedBuffer::MapImpl( ...@@ -137,7 +137,7 @@ scoped_ptr<PlatformSharedBufferMapping> SimplePlatformSharedBuffer::MapImpl(
// return null either. // return null either.
if (real_base == MAP_FAILED || !real_base) { if (real_base == MAP_FAILED || !real_base) {
PLOG(ERROR) << "mmap"; PLOG(ERROR) << "mmap";
return scoped_ptr<PlatformSharedBufferMapping>(); return nullptr;
} }
void* base = static_cast<char*>(real_base) + offset_rounding; void* base = static_cast<char*>(real_base) + offset_rounding;
......
...@@ -75,7 +75,7 @@ scoped_ptr<PlatformSharedBufferMapping> SimplePlatformSharedBuffer::MapImpl( ...@@ -75,7 +75,7 @@ scoped_ptr<PlatformSharedBufferMapping> SimplePlatformSharedBuffer::MapImpl(
real_length); real_length);
if (!real_base) { if (!real_base) {
PLOG(ERROR) << "MapViewOfFile"; PLOG(ERROR) << "MapViewOfFile";
return scoped_ptr<PlatformSharedBufferMapping>(); return nullptr;
} }
void* base = static_cast<char*>(real_base) + offset_rounding; void* base = static_cast<char*>(real_base) + offset_rounding;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment