| 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/mock_host_resolver_creator.h" | 7 #include "chrome/browser/extensions/api/dns/mock_host_resolver_creator.h" |
| 8 #include "chrome/browser/extensions/extension_apitest.h" | 8 #include "chrome/browser/extensions/extension_apitest.h" |
| 9 #include "chrome/browser/extensions/extension_function_test_utils.h" | 9 #include "chrome/browser/extensions/extension_function_test_utils.h" |
| 10 #include "extensions/browser/api/dns/dns_api.h" | 10 #include "extensions/browser/api/dns/dns_api.h" |
| (...skipping 18 matching lines...) Expand all Loading... |
| 29 ExtensionApiTest::SetUpCommandLine(command_line); | 29 ExtensionApiTest::SetUpCommandLine(command_line); |
| 30 command_line->AppendSwitch( | 30 command_line->AppendSwitch( |
| 31 extensions::switches::kEnableExperimentalExtensionApis); | 31 extensions::switches::kEnableExperimentalExtensionApis); |
| 32 } | 32 } |
| 33 | 33 |
| 34 virtual void SetUpOnMainThread() OVERRIDE { | 34 virtual void SetUpOnMainThread() OVERRIDE { |
| 35 extensions::HostResolverWrapper::GetInstance()->SetHostResolverForTesting( | 35 extensions::HostResolverWrapper::GetInstance()->SetHostResolverForTesting( |
| 36 resolver_creator_->CreateMockHostResolver()); | 36 resolver_creator_->CreateMockHostResolver()); |
| 37 } | 37 } |
| 38 | 38 |
| 39 virtual void CleanUpOnMainThread() OVERRIDE { | 39 virtual void TearDownOnMainThread() OVERRIDE { |
| 40 extensions::HostResolverWrapper::GetInstance()-> | 40 extensions::HostResolverWrapper::GetInstance()-> |
| 41 SetHostResolverForTesting(NULL); | 41 SetHostResolverForTesting(NULL); |
| 42 resolver_creator_->DeleteMockHostResolver(); | 42 resolver_creator_->DeleteMockHostResolver(); |
| 43 } | 43 } |
| 44 | 44 |
| 45 private: | 45 private: |
| 46 base::WaitableEvent resolver_event_; | 46 base::WaitableEvent resolver_event_; |
| 47 | 47 |
| 48 // The MockHostResolver asserts that it's used on the same thread on which | 48 // The MockHostResolver asserts that it's used on the same thread on which |
| 49 // it's created, which is actually a stronger rule than its real counterpart. | 49 // it's created, which is actually a stronger rule than its real counterpart. |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 99 EXPECT_EQ(net::OK, resultCode); | 99 EXPECT_EQ(net::OK, resultCode); |
| 100 | 100 |
| 101 std::string address; | 101 std::string address; |
| 102 EXPECT_TRUE(value->GetString("address", &address)); | 102 EXPECT_TRUE(value->GetString("address", &address)); |
| 103 EXPECT_EQ(extensions::MockHostResolverCreator::kAddress, address); | 103 EXPECT_EQ(extensions::MockHostResolverCreator::kAddress, address); |
| 104 } | 104 } |
| 105 | 105 |
| 106 IN_PROC_BROWSER_TEST_F(DnsApiTest, DnsExtension) { | 106 IN_PROC_BROWSER_TEST_F(DnsApiTest, DnsExtension) { |
| 107 ASSERT_TRUE(RunExtensionTest("dns/api")) << message_; | 107 ASSERT_TRUE(RunExtensionTest("dns/api")) << message_; |
| 108 } | 108 } |
| OLD | NEW |