OLD | NEW |
---|---|
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 <queue> | 5 #include <queue> |
6 | 6 |
7 #include "base/file_util.h" | 7 #include "base/file_util.h" |
8 #include "base/path_service.h" | 8 #include "base/path_service.h" |
9 | 9 |
10 #include "chrome/browser/extensions/extension_event_router_forwarder.h" | 10 #include "chrome/browser/extensions/extension_event_router_forwarder.h" |
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
80 class ExtensionWebRequestTest : public testing::Test { | 80 class ExtensionWebRequestTest : public testing::Test { |
81 protected: | 81 protected: |
82 virtual void SetUp() { | 82 virtual void SetUp() { |
83 event_router_ = new ExtensionEventRouterForwarder(); | 83 event_router_ = new ExtensionEventRouterForwarder(); |
84 enable_referrers_.Init( | 84 enable_referrers_.Init( |
85 prefs::kEnableReferrers, profile_.GetTestingPrefService(), NULL); | 85 prefs::kEnableReferrers, profile_.GetTestingPrefService(), NULL); |
86 network_delegate_.reset(new ChromeNetworkDelegate( | 86 network_delegate_.reset(new ChromeNetworkDelegate( |
87 event_router_.get(), NULL, NULL, &profile_, &enable_referrers_)); | 87 event_router_.get(), NULL, NULL, &profile_, &enable_referrers_)); |
88 context_ = new TestURLRequestContext(); | 88 context_ = new TestURLRequestContext(); |
89 context_->set_network_delegate(network_delegate_.get()); | 89 context_->set_network_delegate(network_delegate_.get()); |
90 context_->set_http_server_properties(NULL); | |
willchan no longer on Chromium
2011/10/06 22:13:22
This shouldn't be necessary, right?
ramant (doing other things)
2011/10/07 01:40:20
Done.
| |
90 } | 91 } |
91 | 92 |
92 MessageLoopForIO io_loop_; | 93 MessageLoopForIO io_loop_; |
93 TestingProfile profile_; | 94 TestingProfile profile_; |
94 TestDelegate delegate_; | 95 TestDelegate delegate_; |
95 BooleanPrefMember enable_referrers_; | 96 BooleanPrefMember enable_referrers_; |
96 TestIPCSender ipc_sender_; | 97 TestIPCSender ipc_sender_; |
97 scoped_refptr<ExtensionEventRouterForwarder> event_router_; | 98 scoped_refptr<ExtensionEventRouterForwarder> event_router_; |
98 scoped_refptr<ExtensionInfoMap> extension_info_map_; | 99 scoped_refptr<ExtensionInfoMap> extension_info_map_; |
99 scoped_ptr<ChromeNetworkDelegate> network_delegate_; | 100 scoped_ptr<ChromeNetworkDelegate> network_delegate_; |
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
325 public testing::TestWithParam<HeaderModificationTest> { | 326 public testing::TestWithParam<HeaderModificationTest> { |
326 protected: | 327 protected: |
327 virtual void SetUp() { | 328 virtual void SetUp() { |
328 event_router_ = new ExtensionEventRouterForwarder(); | 329 event_router_ = new ExtensionEventRouterForwarder(); |
329 enable_referrers_.Init( | 330 enable_referrers_.Init( |
330 prefs::kEnableReferrers, profile_.GetTestingPrefService(), NULL); | 331 prefs::kEnableReferrers, profile_.GetTestingPrefService(), NULL); |
331 network_delegate_.reset(new ChromeNetworkDelegate( | 332 network_delegate_.reset(new ChromeNetworkDelegate( |
332 event_router_.get(), NULL, NULL, &profile_, &enable_referrers_)); | 333 event_router_.get(), NULL, NULL, &profile_, &enable_referrers_)); |
333 context_ = new TestURLRequestContext(); | 334 context_ = new TestURLRequestContext(); |
334 context_->set_network_delegate(network_delegate_.get()); | 335 context_->set_network_delegate(network_delegate_.get()); |
336 context_->set_http_server_properties(NULL); | |
335 } | 337 } |
336 | 338 |
337 MessageLoopForIO io_loop_; | 339 MessageLoopForIO io_loop_; |
338 TestingProfile profile_; | 340 TestingProfile profile_; |
339 TestDelegate delegate_; | 341 TestDelegate delegate_; |
340 BooleanPrefMember enable_referrers_; | 342 BooleanPrefMember enable_referrers_; |
341 TestIPCSender ipc_sender_; | 343 TestIPCSender ipc_sender_; |
342 scoped_refptr<ExtensionEventRouterForwarder> event_router_; | 344 scoped_refptr<ExtensionEventRouterForwarder> event_router_; |
343 scoped_refptr<ExtensionInfoMap> extension_info_map_; | 345 scoped_refptr<ExtensionInfoMap> extension_info_map_; |
344 scoped_ptr<ChromeNetworkDelegate> network_delegate_; | 346 scoped_ptr<ChromeNetworkDelegate> network_delegate_; |
(...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
643 {"header2", "bar"} } | 645 {"header2", "bar"} } |
644 }, | 646 }, |
645 }; | 647 }; |
646 | 648 |
647 INSTANTIATE_TEST_CASE_P( | 649 INSTANTIATE_TEST_CASE_P( |
648 ExtensionWebRequest, | 650 ExtensionWebRequest, |
649 ExtensionWebRequestHeaderModificationTest, | 651 ExtensionWebRequestHeaderModificationTest, |
650 ::testing::ValuesIn(kTests)); | 652 ::testing::ValuesIn(kTests)); |
651 | 653 |
652 } // namespace | 654 } // namespace |
OLD | NEW |