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

Side by Side Diff: extensions/browser/api/dns/dns_apitest.cc

Issue 598173003: Run clang-modernize -use-nullptr over src/extensions/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/memory/ref_counted.h" 5 #include "base/memory/ref_counted.h"
6 #include "base/memory/scoped_ptr.h" 6 #include "base/memory/scoped_ptr.h"
7 #include "base/values.h" 7 #include "base/values.h"
8 #include "content/public/browser/notification_service.h" 8 #include "content/public/browser/notification_service.h"
9 #include "content/public/test/test_utils.h" 9 #include "content/public/test/test_utils.h"
10 #include "extensions/browser/api/dns/dns_api.h" 10 #include "extensions/browser/api/dns/dns_api.h"
(...skipping 15 matching lines...) Expand all
26 DnsApiTest() : resolver_creator_(new MockHostResolverCreator()) {} 26 DnsApiTest() : resolver_creator_(new MockHostResolverCreator()) {}
27 27
28 private: 28 private:
29 virtual void SetUpOnMainThread() OVERRIDE { 29 virtual void SetUpOnMainThread() OVERRIDE {
30 ShellApiTest::SetUpOnMainThread(); 30 ShellApiTest::SetUpOnMainThread();
31 HostResolverWrapper::GetInstance()->SetHostResolverForTesting( 31 HostResolverWrapper::GetInstance()->SetHostResolverForTesting(
32 resolver_creator_->CreateMockHostResolver()); 32 resolver_creator_->CreateMockHostResolver());
33 } 33 }
34 34
35 virtual void TearDownOnMainThread() OVERRIDE { 35 virtual void TearDownOnMainThread() OVERRIDE {
36 HostResolverWrapper::GetInstance()->SetHostResolverForTesting(NULL); 36 HostResolverWrapper::GetInstance()->SetHostResolverForTesting(nullptr);
37 resolver_creator_->DeleteMockHostResolver(); 37 resolver_creator_->DeleteMockHostResolver();
38 ShellApiTest::TearDownOnMainThread(); 38 ShellApiTest::TearDownOnMainThread();
39 } 39 }
40 40
41 // The MockHostResolver asserts that it's used on the same thread on which 41 // The MockHostResolver asserts that it's used on the same thread on which
42 // it's created, which is actually a stronger rule than its real counterpart. 42 // it's created, which is actually a stronger rule than its real counterpart.
43 // But that's fine; it's good practice. 43 // But that's fine; it's good practice.
44 scoped_refptr<MockHostResolverCreator> resolver_creator_; 44 scoped_refptr<MockHostResolverCreator> resolver_creator_;
45 }; 45 };
46 46
47 IN_PROC_BROWSER_TEST_F(DnsApiTest, DnsResolveIPLiteral) { 47 IN_PROC_BROWSER_TEST_F(DnsApiTest, DnsResolveIPLiteral) {
48 scoped_refptr<DnsResolveFunction> resolve_function(new DnsResolveFunction()); 48 scoped_refptr<DnsResolveFunction> resolve_function(new DnsResolveFunction());
49 scoped_refptr<Extension> empty_extension = test_util::CreateEmptyExtension(); 49 scoped_refptr<Extension> empty_extension = test_util::CreateEmptyExtension();
50 50
51 resolve_function->set_extension(empty_extension.get()); 51 resolve_function->set_extension(empty_extension.get());
52 resolve_function->set_has_callback(true); 52 resolve_function->set_has_callback(true);
53 53
54 scoped_ptr<base::Value> result(RunFunctionAndReturnSingleResult( 54 scoped_ptr<base::Value> result(RunFunctionAndReturnSingleResult(
55 resolve_function.get(), "[\"127.0.0.1\"]", browser_context())); 55 resolve_function.get(), "[\"127.0.0.1\"]", browser_context()));
56 base::DictionaryValue* dict = NULL; 56 base::DictionaryValue* dict = nullptr;
57 ASSERT_TRUE(result->GetAsDictionary(&dict)); 57 ASSERT_TRUE(result->GetAsDictionary(&dict));
58 58
59 int result_code = 0; 59 int result_code = 0;
60 EXPECT_TRUE(dict->GetInteger("resultCode", &result_code)); 60 EXPECT_TRUE(dict->GetInteger("resultCode", &result_code));
61 EXPECT_EQ(net::OK, result_code); 61 EXPECT_EQ(net::OK, result_code);
62 62
63 std::string address; 63 std::string address;
64 EXPECT_TRUE(dict->GetString("address", &address)); 64 EXPECT_TRUE(dict->GetString("address", &address));
65 EXPECT_EQ("127.0.0.1", address); 65 EXPECT_EQ("127.0.0.1", address);
66 } 66 }
67 67
68 IN_PROC_BROWSER_TEST_F(DnsApiTest, DnsResolveHostname) { 68 IN_PROC_BROWSER_TEST_F(DnsApiTest, DnsResolveHostname) {
69 scoped_refptr<DnsResolveFunction> resolve_function(new DnsResolveFunction()); 69 scoped_refptr<DnsResolveFunction> resolve_function(new DnsResolveFunction());
70 scoped_refptr<Extension> empty_extension = test_util::CreateEmptyExtension(); 70 scoped_refptr<Extension> empty_extension = test_util::CreateEmptyExtension();
71 71
72 resolve_function->set_extension(empty_extension.get()); 72 resolve_function->set_extension(empty_extension.get());
73 resolve_function->set_has_callback(true); 73 resolve_function->set_has_callback(true);
74 74
75 std::string function_arguments("[\""); 75 std::string function_arguments("[\"");
76 function_arguments += MockHostResolverCreator::kHostname; 76 function_arguments += MockHostResolverCreator::kHostname;
77 function_arguments += "\"]"; 77 function_arguments += "\"]";
78 scoped_ptr<base::Value> result(RunFunctionAndReturnSingleResult( 78 scoped_ptr<base::Value> result(RunFunctionAndReturnSingleResult(
79 resolve_function.get(), function_arguments, browser_context())); 79 resolve_function.get(), function_arguments, browser_context()));
80 base::DictionaryValue* dict = NULL; 80 base::DictionaryValue* dict = nullptr;
81 ASSERT_TRUE(result->GetAsDictionary(&dict)); 81 ASSERT_TRUE(result->GetAsDictionary(&dict));
82 82
83 int result_code = 0; 83 int result_code = 0;
84 EXPECT_TRUE(dict->GetInteger("resultCode", &result_code)); 84 EXPECT_TRUE(dict->GetInteger("resultCode", &result_code));
85 EXPECT_EQ(net::OK, result_code); 85 EXPECT_EQ(net::OK, result_code);
86 86
87 std::string address; 87 std::string address;
88 EXPECT_TRUE(dict->GetString("address", &address)); 88 EXPECT_TRUE(dict->GetString("address", &address));
89 EXPECT_EQ(MockHostResolverCreator::kAddress, address); 89 EXPECT_EQ(MockHostResolverCreator::kAddress, address);
90 } 90 }
91 91
92 IN_PROC_BROWSER_TEST_F(DnsApiTest, DnsExtension) { 92 IN_PROC_BROWSER_TEST_F(DnsApiTest, DnsExtension) {
93 ASSERT_TRUE(RunAppTest("api_test/dns/api")) << message_; 93 ASSERT_TRUE(RunAppTest("api_test/dns/api")) << message_;
94 } 94 }
95 95
96 } // namespace extensions 96 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698