Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3947)

Unified Diff: cc/test/test_context_provider.cc

Issue 634243003: [C++11 Allowed Features] Declares a type-safe null pointer converting from NULL to nullptr [part-4] (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Formating fix. Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: cc/test/test_context_provider.cc
diff --git a/cc/test/test_context_provider.cc b/cc/test/test_context_provider.cc
index e7697f17d25ea69618c976a058cb81d1b1a350f4..694ba5ed6af9bfc33c93158d1f86d5ff02256988 100644
--- a/cc/test/test_context_provider.cc
+++ b/cc/test/test_context_provider.cc
@@ -24,7 +24,7 @@ scoped_refptr<TestContextProvider> TestContextProvider::Create() {
scoped_refptr<TestContextProvider> TestContextProvider::Create(
scoped_ptr<TestWebGraphicsContext3D> context) {
if (!context)
- return NULL;
+ return nullptr;
return new TestContextProvider(context.Pass());
}
@@ -91,7 +91,7 @@ class GrContext* TestContextProvider::GrContext() {
DCHECK(context_thread_checker_.CalledOnValidThread());
// TODO(danakj): Make a test GrContext that works with a test Context3d.
- return NULL;
+ return nullptr;
}
bool TestContextProvider::IsContextLost() {

Powered by Google App Engine
This is Rietveld 408576698