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

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

Issue 12518036: net: move host_resolver files from net/base to net/dns (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "chrome/browser/extensions/api/dns/dns_api.h" 7 #include "chrome/browser/extensions/api/dns/dns_api.h"
8 #include "chrome/browser/extensions/api/dns/host_resolver_wrapper.h" 8 #include "chrome/browser/extensions/api/dns/host_resolver_wrapper.h"
9 #include "chrome/browser/extensions/api/dns/mock_host_resolver_creator.h" 9 #include "chrome/browser/extensions/api/dns/mock_host_resolver_creator.h"
10 #include "chrome/browser/extensions/extension_apitest.h" 10 #include "chrome/browser/extensions/extension_apitest.h"
11 #include "chrome/browser/extensions/extension_function_test_utils.h" 11 #include "chrome/browser/extensions/extension_function_test_utils.h"
12 #include "chrome/common/chrome_switches.h" 12 #include "chrome/common/chrome_switches.h"
13 #include "net/base/mock_host_resolver.h"
14 #include "net/base/net_errors.h" 13 #include "net/base/net_errors.h"
15 #include "net/base/net_util.h" 14 #include "net/base/net_util.h"
15 #include "net/dns/mock_host_resolver.h"
16 16
17 using extension_function_test_utils::CreateEmptyExtension; 17 using extension_function_test_utils::CreateEmptyExtension;
18 using extension_function_test_utils::RunFunctionAndReturnSingleResult; 18 using extension_function_test_utils::RunFunctionAndReturnSingleResult;
19 19
20 namespace { 20 namespace {
21 21
22 class DnsApiTest : public ExtensionApiTest { 22 class DnsApiTest : public ExtensionApiTest {
23 public: 23 public:
24 DnsApiTest() : resolver_event_(true, false), 24 DnsApiTest() : resolver_event_(true, false),
25 resolver_creator_(new extensions::MockHostResolverCreator()) { 25 resolver_creator_(new extensions::MockHostResolverCreator()) {
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 EXPECT_EQ(net::OK, resultCode); 96 EXPECT_EQ(net::OK, resultCode);
97 97
98 std::string address; 98 std::string address;
99 EXPECT_TRUE(value->GetString("address", &address)); 99 EXPECT_TRUE(value->GetString("address", &address));
100 EXPECT_EQ(extensions::MockHostResolverCreator::kAddress, address); 100 EXPECT_EQ(extensions::MockHostResolverCreator::kAddress, address);
101 } 101 }
102 102
103 IN_PROC_BROWSER_TEST_F(DnsApiTest, DnsExtension) { 103 IN_PROC_BROWSER_TEST_F(DnsApiTest, DnsExtension) {
104 ASSERT_TRUE(RunExtensionTest("dns/api")) << message_; 104 ASSERT_TRUE(RunExtensionTest("dns/api")) << message_;
105 } 105 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698