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

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

Issue 20593003: Move kEnableExperimentalExtensionApis switch to extensions/common/switches.cc. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 4 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 "extensions/common/switches.h"
13 #include "net/base/net_errors.h" 13 #include "net/base/net_errors.h"
14 #include "net/base/net_util.h" 14 #include "net/base/net_util.h"
15 #include "net/dns/mock_host_resolver.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()) {
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(
31 extensions::switches::kEnableExperimentalExtensionApis);
31 } 32 }
32 33
33 virtual void SetUpOnMainThread() OVERRIDE { 34 virtual void SetUpOnMainThread() OVERRIDE {
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);
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 EXPECT_EQ(net::OK, resultCode); 99 EXPECT_EQ(net::OK, resultCode);
99 100
100 std::string address; 101 std::string address;
101 EXPECT_TRUE(value->GetString("address", &address)); 102 EXPECT_TRUE(value->GetString("address", &address));
102 EXPECT_EQ(extensions::MockHostResolverCreator::kAddress, address); 103 EXPECT_EQ(extensions::MockHostResolverCreator::kAddress, address);
103 } 104 }
104 105
105 IN_PROC_BROWSER_TEST_F(DnsApiTest, DnsExtension) { 106 IN_PROC_BROWSER_TEST_F(DnsApiTest, DnsExtension) {
106 ASSERT_TRUE(RunExtensionTest("dns/api")) << message_; 107 ASSERT_TRUE(RunExtensionTest("dns/api")) << message_;
107 } 108 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698