OLD | NEW |
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" |
(...skipping 13 matching lines...) Expand all Loading... |
24 DnsApiTest() : resolver_event_(true, false), | 24 DnsApiTest() : resolver_event_(true, false), |
25 resolver_creator_(new extensions::MockHostResolverCreator()) { | 25 resolver_creator_(new extensions::MockHostResolverCreator()) { |
26 } | 26 } |
27 | 27 |
28 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { | 28 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { |
29 ExtensionApiTest::SetUpCommandLine(command_line); | 29 ExtensionApiTest::SetUpCommandLine(command_line); |
30 command_line->AppendSwitch(switches::kEnableExperimentalExtensionApis); | 30 command_line->AppendSwitch(switches::kEnableExperimentalExtensionApis); |
31 } | 31 } |
32 | 32 |
33 virtual void SetUpOnMainThread() OVERRIDE { | 33 virtual void SetUpOnMainThread() OVERRIDE { |
| 34 ExtensionApiTest::SetUpOnMainThread(); |
34 extensions::HostResolverWrapper::GetInstance()->SetHostResolverForTesting( | 35 extensions::HostResolverWrapper::GetInstance()->SetHostResolverForTesting( |
35 resolver_creator_->CreateMockHostResolver()); | 36 resolver_creator_->CreateMockHostResolver()); |
36 } | 37 } |
37 | 38 |
38 virtual void CleanUpOnMainThread() OVERRIDE { | 39 virtual void CleanUpOnMainThread() OVERRIDE { |
39 extensions::HostResolverWrapper::GetInstance()-> | 40 extensions::HostResolverWrapper::GetInstance()-> |
40 SetHostResolverForTesting(NULL); | 41 SetHostResolverForTesting(NULL); |
41 resolver_creator_->DeleteMockHostResolver(); | 42 resolver_creator_->DeleteMockHostResolver(); |
| 43 ExtensionApiTest::CleanUpOnMainThread(); |
42 } | 44 } |
43 | 45 |
44 private: | 46 private: |
45 base::WaitableEvent resolver_event_; | 47 base::WaitableEvent resolver_event_; |
46 | 48 |
47 // The MockHostResolver asserts that it's used on the same thread on which | 49 // The MockHostResolver asserts that it's used on the same thread on which |
48 // it's created, which is actually a stronger rule than its real counterpart. | 50 // it's created, which is actually a stronger rule than its real counterpart. |
49 // But that's fine; it's good practice. | 51 // But that's fine; it's good practice. |
50 scoped_refptr<extensions::MockHostResolverCreator> resolver_creator_; | 52 scoped_refptr<extensions::MockHostResolverCreator> resolver_creator_; |
51 }; | 53 }; |
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
96 EXPECT_EQ(net::OK, resultCode); | 98 EXPECT_EQ(net::OK, resultCode); |
97 | 99 |
98 std::string address; | 100 std::string address; |
99 EXPECT_TRUE(value->GetString("address", &address)); | 101 EXPECT_TRUE(value->GetString("address", &address)); |
100 EXPECT_EQ(extensions::MockHostResolverCreator::kAddress, address); | 102 EXPECT_EQ(extensions::MockHostResolverCreator::kAddress, address); |
101 } | 103 } |
102 | 104 |
103 IN_PROC_BROWSER_TEST_F(DnsApiTest, DnsExtension) { | 105 IN_PROC_BROWSER_TEST_F(DnsApiTest, DnsExtension) { |
104 ASSERT_TRUE(RunExtensionTest("dns/api")) << message_; | 106 ASSERT_TRUE(RunExtensionTest("dns/api")) << message_; |
105 } | 107 } |
OLD | NEW |