| Index: extensions/browser/api/dns/dns_apitest.cc
|
| diff --git a/extensions/browser/api/dns/dns_apitest.cc b/extensions/browser/api/dns/dns_apitest.cc
|
| index 8e269796e9ba3e9a6d4b721007a85c6d0dbc80d0..85b3e9c8c26a9eec7987e3e10fee4a16e590215b 100644
|
| --- a/extensions/browser/api/dns/dns_apitest.cc
|
| +++ b/extensions/browser/api/dns/dns_apitest.cc
|
| @@ -33,7 +33,7 @@ class DnsApiTest : public ShellApiTest {
|
| }
|
|
|
| virtual void TearDownOnMainThread() OVERRIDE {
|
| - HostResolverWrapper::GetInstance()->SetHostResolverForTesting(NULL);
|
| + HostResolverWrapper::GetInstance()->SetHostResolverForTesting(nullptr);
|
| resolver_creator_->DeleteMockHostResolver();
|
| ShellApiTest::TearDownOnMainThread();
|
| }
|
| @@ -53,7 +53,7 @@ IN_PROC_BROWSER_TEST_F(DnsApiTest, DnsResolveIPLiteral) {
|
|
|
| scoped_ptr<base::Value> result(RunFunctionAndReturnSingleResult(
|
| resolve_function.get(), "[\"127.0.0.1\"]", browser_context()));
|
| - base::DictionaryValue* dict = NULL;
|
| + base::DictionaryValue* dict = nullptr;
|
| ASSERT_TRUE(result->GetAsDictionary(&dict));
|
|
|
| int result_code = 0;
|
| @@ -77,7 +77,7 @@ IN_PROC_BROWSER_TEST_F(DnsApiTest, DnsResolveHostname) {
|
| function_arguments += "\"]";
|
| scoped_ptr<base::Value> result(RunFunctionAndReturnSingleResult(
|
| resolve_function.get(), function_arguments, browser_context()));
|
| - base::DictionaryValue* dict = NULL;
|
| + base::DictionaryValue* dict = nullptr;
|
| ASSERT_TRUE(result->GetAsDictionary(&dict));
|
|
|
| int result_code = 0;
|
|
|