diff options
| author | Zeno Albisser <zeno.albisser@theqtcompany.com> | 2014-12-05 15:04:29 +0100 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@theqtcompany.com> | 2014-12-09 10:49:28 +0100 |
| commit | af6588f8d723931a298c995fa97259bb7f7deb55 (patch) | |
| tree | 060ca707847ba1735f01af2372e0d5e494dc0366 /chromium/cc/debug/micro_benchmark.cc | |
| parent | 2fff84d821cc7b1c785f6404e0f8091333283e74 (diff) | |
| download | qtwebengine-chromium-af6588f8d723931a298c995fa97259bb7f7deb55.tar.gz | |
BASELINE: Update chromium to 40.0.2214.28 and ninja to 1.5.3.
Change-Id: I759465284fd64d59ad120219cbe257f7402c4181
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
Diffstat (limited to 'chromium/cc/debug/micro_benchmark.cc')
| -rw-r--r-- | chromium/cc/debug/micro_benchmark.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chromium/cc/debug/micro_benchmark.cc b/chromium/cc/debug/micro_benchmark.cc index 05c5c0d1a56..64629de165a 100644 --- a/chromium/cc/debug/micro_benchmark.cc +++ b/chromium/cc/debug/micro_benchmark.cc @@ -54,7 +54,7 @@ scoped_ptr<MicroBenchmarkImpl> MicroBenchmark::GetBenchmarkImpl( scoped_ptr<MicroBenchmarkImpl> MicroBenchmark::CreateBenchmarkImpl( scoped_refptr<base::MessageLoopProxy> origin_loop) { - return make_scoped_ptr<MicroBenchmarkImpl>(NULL); + return make_scoped_ptr<MicroBenchmarkImpl>(nullptr); } } // namespace cc |