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

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

Issue 1902873002: Convert //extensions/browser/api from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 <memory>
6
5 #include "base/memory/ref_counted.h" 7 #include "base/memory/ref_counted.h"
6 #include "base/memory/scoped_ptr.h"
7 #include "base/values.h" 8 #include "base/values.h"
8 #include "content/public/browser/notification_service.h" 9 #include "content/public/browser/notification_service.h"
9 #include "content/public/test/test_utils.h" 10 #include "content/public/test/test_utils.h"
10 #include "extensions/browser/api/dns/dns_api.h" 11 #include "extensions/browser/api/dns/dns_api.h"
11 #include "extensions/browser/api/dns/host_resolver_wrapper.h" 12 #include "extensions/browser/api/dns/host_resolver_wrapper.h"
12 #include "extensions/browser/api/dns/mock_host_resolver_creator.h" 13 #include "extensions/browser/api/dns/mock_host_resolver_creator.h"
13 #include "extensions/browser/api_test_utils.h" 14 #include "extensions/browser/api_test_utils.h"
14 #include "extensions/browser/notification_types.h" 15 #include "extensions/browser/notification_types.h"
15 #include "extensions/common/extension.h" 16 #include "extensions/common/extension.h"
16 #include "extensions/common/test_util.h" 17 #include "extensions/common/test_util.h"
(...skipping 27 matching lines...) Expand all
44 scoped_refptr<MockHostResolverCreator> resolver_creator_; 45 scoped_refptr<MockHostResolverCreator> resolver_creator_;
45 }; 46 };
46 47
47 IN_PROC_BROWSER_TEST_F(DnsApiTest, DnsResolveIPLiteral) { 48 IN_PROC_BROWSER_TEST_F(DnsApiTest, DnsResolveIPLiteral) {
48 scoped_refptr<DnsResolveFunction> resolve_function(new DnsResolveFunction()); 49 scoped_refptr<DnsResolveFunction> resolve_function(new DnsResolveFunction());
49 scoped_refptr<Extension> empty_extension = test_util::CreateEmptyExtension(); 50 scoped_refptr<Extension> empty_extension = test_util::CreateEmptyExtension();
50 51
51 resolve_function->set_extension(empty_extension.get()); 52 resolve_function->set_extension(empty_extension.get());
52 resolve_function->set_has_callback(true); 53 resolve_function->set_has_callback(true);
53 54
54 scoped_ptr<base::Value> result(RunFunctionAndReturnSingleResult( 55 std::unique_ptr<base::Value> result(RunFunctionAndReturnSingleResult(
55 resolve_function.get(), "[\"127.0.0.1\"]", browser_context())); 56 resolve_function.get(), "[\"127.0.0.1\"]", browser_context()));
56 base::DictionaryValue* dict = NULL; 57 base::DictionaryValue* dict = NULL;
57 ASSERT_TRUE(result->GetAsDictionary(&dict)); 58 ASSERT_TRUE(result->GetAsDictionary(&dict));
58 59
59 int result_code = 0; 60 int result_code = 0;
60 EXPECT_TRUE(dict->GetInteger("resultCode", &result_code)); 61 EXPECT_TRUE(dict->GetInteger("resultCode", &result_code));
61 EXPECT_EQ(net::OK, result_code); 62 EXPECT_EQ(net::OK, result_code);
62 63
63 std::string address; 64 std::string address;
64 EXPECT_TRUE(dict->GetString("address", &address)); 65 EXPECT_TRUE(dict->GetString("address", &address));
65 EXPECT_EQ("127.0.0.1", address); 66 EXPECT_EQ("127.0.0.1", address);
66 } 67 }
67 68
68 IN_PROC_BROWSER_TEST_F(DnsApiTest, DnsResolveHostname) { 69 IN_PROC_BROWSER_TEST_F(DnsApiTest, DnsResolveHostname) {
69 scoped_refptr<DnsResolveFunction> resolve_function(new DnsResolveFunction()); 70 scoped_refptr<DnsResolveFunction> resolve_function(new DnsResolveFunction());
70 scoped_refptr<Extension> empty_extension = test_util::CreateEmptyExtension(); 71 scoped_refptr<Extension> empty_extension = test_util::CreateEmptyExtension();
71 72
72 resolve_function->set_extension(empty_extension.get()); 73 resolve_function->set_extension(empty_extension.get());
73 resolve_function->set_has_callback(true); 74 resolve_function->set_has_callback(true);
74 75
75 std::string function_arguments("[\""); 76 std::string function_arguments("[\"");
76 function_arguments += MockHostResolverCreator::kHostname; 77 function_arguments += MockHostResolverCreator::kHostname;
77 function_arguments += "\"]"; 78 function_arguments += "\"]";
78 scoped_ptr<base::Value> result(RunFunctionAndReturnSingleResult( 79 std::unique_ptr<base::Value> result(RunFunctionAndReturnSingleResult(
79 resolve_function.get(), function_arguments, browser_context())); 80 resolve_function.get(), function_arguments, browser_context()));
80 base::DictionaryValue* dict = NULL; 81 base::DictionaryValue* dict = NULL;
81 ASSERT_TRUE(result->GetAsDictionary(&dict)); 82 ASSERT_TRUE(result->GetAsDictionary(&dict));
82 83
83 int result_code = 0; 84 int result_code = 0;
84 EXPECT_TRUE(dict->GetInteger("resultCode", &result_code)); 85 EXPECT_TRUE(dict->GetInteger("resultCode", &result_code));
85 EXPECT_EQ(net::OK, result_code); 86 EXPECT_EQ(net::OK, result_code);
86 87
87 std::string address; 88 std::string address;
88 EXPECT_TRUE(dict->GetString("address", &address)); 89 EXPECT_TRUE(dict->GetString("address", &address));
89 EXPECT_EQ(MockHostResolverCreator::kAddress, address); 90 EXPECT_EQ(MockHostResolverCreator::kAddress, address);
90 } 91 }
91 92
92 IN_PROC_BROWSER_TEST_F(DnsApiTest, DnsExtension) { 93 IN_PROC_BROWSER_TEST_F(DnsApiTest, DnsExtension) {
93 ASSERT_TRUE(RunAppTest("api_test/dns/api")) << message_; 94 ASSERT_TRUE(RunAppTest("api_test/dns/api")) << message_;
94 } 95 }
95 96
96 } // namespace extensions 97 } // namespace extensions
OLDNEW
« no previous file with comments | « extensions/browser/api/dns/dns_api.cc ('k') | extensions/browser/api/document_scan/document_scan_api.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698