| 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 12 matching lines...) Expand all Loading... |
| 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()) { |
| 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 void SetUpOnMainThread() OVERRIDE { | 33 virtual void SetUpOnMainThread() OVERRIDE { |
| 34 extensions::HostResolverWrapper::GetInstance()->SetHostResolverForTesting( | 34 extensions::HostResolverWrapper::GetInstance()->SetHostResolverForTesting( |
| 35 resolver_creator_->CreateMockHostResolver()); | 35 resolver_creator_->CreateMockHostResolver()); |
| 36 } | 36 } |
| 37 | 37 |
| 38 void CleanUpOnMainThread() OVERRIDE { | 38 virtual void CleanUpOnMainThread() OVERRIDE { |
| 39 extensions::HostResolverWrapper::GetInstance()-> | 39 extensions::HostResolverWrapper::GetInstance()-> |
| 40 SetHostResolverForTesting(NULL); | 40 SetHostResolverForTesting(NULL); |
| 41 resolver_creator_->DeleteMockHostResolver(); | 41 resolver_creator_->DeleteMockHostResolver(); |
| 42 } | 42 } |
| 43 | 43 |
| 44 private: | 44 private: |
| 45 base::WaitableEvent resolver_event_; | 45 base::WaitableEvent resolver_event_; |
| 46 | 46 |
| 47 // The MockHostResolver asserts that it's used on the same thread on which | 47 // 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. | 48 // it's created, which is actually a stronger rule than its real counterpart. |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 } |
| OLD | NEW |