| 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" |
| 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 "net/base/mock_host_resolver.h" | 13 #include "net/base/mock_host_resolver.h" |
| 13 #include "net/base/net_errors.h" | 14 #include "net/base/net_errors.h" |
| 14 #include "net/base/net_util.h" | 15 #include "net/base/net_util.h" |
| 15 | 16 |
| 16 using extension_function_test_utils::CreateEmptyExtension; | 17 using extension_function_test_utils::CreateEmptyExtension; |
| 17 using extension_function_test_utils::RunFunctionAndReturnSingleResult; | 18 using extension_function_test_utils::RunFunctionAndReturnSingleResult; |
| 18 | 19 |
| 19 namespace { | 20 namespace { |
| 20 | 21 |
| 21 class DnsApiTest : public PlatformAppApiTest { | 22 class DnsApiTest : public ExtensionApiTest { |
| 22 public: | 23 public: |
| 23 DnsApiTest() : resolver_event_(true, false), | 24 DnsApiTest() : resolver_event_(true, false), |
| 24 resolver_creator_(new extensions::MockHostResolverCreator()) { | 25 resolver_creator_(new extensions::MockHostResolverCreator()) { |
| 25 } | 26 } |
| 26 | 27 |
| 28 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { |
| 29 ExtensionApiTest::SetUpCommandLine(command_line); |
| 30 command_line->AppendSwitch(switches::kEnableExperimentalExtensionApis); |
| 31 } |
| 32 |
| 27 void SetUpOnMainThread() OVERRIDE { | 33 void SetUpOnMainThread() OVERRIDE { |
| 28 extensions::HostResolverWrapper::GetInstance()->SetHostResolverForTesting( | 34 extensions::HostResolverWrapper::GetInstance()->SetHostResolverForTesting( |
| 29 resolver_creator_->CreateMockHostResolver()); | 35 resolver_creator_->CreateMockHostResolver()); |
| 30 } | 36 } |
| 31 | 37 |
| 32 void CleanUpOnMainThread() OVERRIDE { | 38 void CleanUpOnMainThread() OVERRIDE { |
| 33 extensions::HostResolverWrapper::GetInstance()-> | 39 extensions::HostResolverWrapper::GetInstance()-> |
| 34 SetHostResolverForTesting(NULL); | 40 SetHostResolverForTesting(NULL); |
| 35 resolver_creator_->DeleteMockHostResolver(); | 41 resolver_creator_->DeleteMockHostResolver(); |
| 36 } | 42 } |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 90 EXPECT_EQ(net::OK, resultCode); | 96 EXPECT_EQ(net::OK, resultCode); |
| 91 | 97 |
| 92 std::string address; | 98 std::string address; |
| 93 EXPECT_TRUE(value->GetString("address", &address)); | 99 EXPECT_TRUE(value->GetString("address", &address)); |
| 94 EXPECT_EQ(extensions::MockHostResolverCreator::kAddress, address); | 100 EXPECT_EQ(extensions::MockHostResolverCreator::kAddress, address); |
| 95 } | 101 } |
| 96 | 102 |
| 97 IN_PROC_BROWSER_TEST_F(DnsApiTest, DnsExtension) { | 103 IN_PROC_BROWSER_TEST_F(DnsApiTest, DnsExtension) { |
| 98 ASSERT_TRUE(RunExtensionTest("dns/api")) << message_; | 104 ASSERT_TRUE(RunExtensionTest("dns/api")) << message_; |
| 99 } | 105 } |
| OLD | NEW |