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 <string> | 5 #include <string> |
6 | 6 |
7 #include "base/file_util.h" | 7 #include "base/file_util.h" |
8 #include "base/message_loop.h" | 8 #include "base/message_loop.h" |
9 #include "chrome/browser/extensions/extension_info_map.h" | 9 #include "chrome/browser/extensions/extension_info_map.h" |
10 #include "chrome/browser/extensions/extension_protocols.h" | 10 #include "chrome/browser/extensions/extension_protocols.h" |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
49 io_thread_(BrowserThread::IO, &message_loop_) {} | 49 io_thread_(BrowserThread::IO, &message_loop_) {} |
50 | 50 |
51 virtual void SetUp() { | 51 virtual void SetUp() { |
52 extension_info_map_ = new ExtensionInfoMap(); | 52 extension_info_map_ = new ExtensionInfoMap(); |
53 net::URLRequestContext* request_context = | 53 net::URLRequestContext* request_context = |
54 resource_context_.GetRequestContext(); | 54 resource_context_.GetRequestContext(); |
55 old_factory_ = request_context->job_factory(); | 55 old_factory_ = request_context->job_factory(); |
56 // Register an incognito extension protocol handler. | 56 // Register an incognito extension protocol handler. |
57 job_factory_.SetProtocolHandler( | 57 job_factory_.SetProtocolHandler( |
58 chrome::kExtensionScheme, | 58 chrome::kExtensionScheme, |
59 CreateExtensionProtocolHandler(true, extension_info_map_)); | 59 CreateExtensionProtocolHandler(true, extension_info_map_.get())); |
60 request_context->set_job_factory(&job_factory_); | 60 request_context->set_job_factory(&job_factory_); |
61 } | 61 } |
62 | 62 |
63 virtual void TearDown() { | 63 virtual void TearDown() { |
64 net::URLRequestContext* request_context = | 64 net::URLRequestContext* request_context = |
65 resource_context_.GetRequestContext(); | 65 resource_context_.GetRequestContext(); |
66 request_context->set_job_factory(old_factory_); | 66 request_context->set_job_factory(old_factory_); |
67 } | 67 } |
68 | 68 |
69 void StartRequest(net::URLRequest* request, | 69 void StartRequest(net::URLRequest* request, |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
107 {"spanning disabled", false, false, false, false}, | 107 {"spanning disabled", false, false, false, false}, |
108 {"split disabled", true, false, false, false}, | 108 {"split disabled", true, false, false, false}, |
109 {"spanning enabled", false, true, false, true}, | 109 {"spanning enabled", false, true, false, true}, |
110 {"split enabled", true, true, true, true}, | 110 {"split enabled", true, true, true, true}, |
111 }; | 111 }; |
112 | 112 |
113 for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); ++i) { | 113 for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); ++i) { |
114 scoped_refptr<Extension> extension = | 114 scoped_refptr<Extension> extension = |
115 CreateTestExtension(cases[i].name, cases[i].incognito_split_mode); | 115 CreateTestExtension(cases[i].name, cases[i].incognito_split_mode); |
116 extension_info_map_->AddExtension( | 116 extension_info_map_->AddExtension( |
117 extension, base::Time::Now(), cases[i].incognito_enabled); | 117 extension.get(), base::Time::Now(), cases[i].incognito_enabled); |
118 | 118 |
119 // First test a main frame request. | 119 // First test a main frame request. |
120 { | 120 { |
121 // It doesn't matter that the resource doesn't exist. If the resource | 121 // It doesn't matter that the resource doesn't exist. If the resource |
122 // is blocked, we should see ADDRESS_UNREACHABLE. Otherwise, the request | 122 // is blocked, we should see ADDRESS_UNREACHABLE. Otherwise, the request |
123 // should just fail because the file doesn't exist. | 123 // should just fail because the file doesn't exist. |
124 net::URLRequest request(extension->GetResourceURL("404.html"), | 124 net::URLRequest request(extension->GetResourceURL("404.html"), |
125 &test_delegate_, | 125 &test_delegate_, |
126 resource_context_.GetRequestContext()); | 126 resource_context_.GetRequestContext()); |
127 StartRequest(&request, ResourceType::MAIN_FRAME); | 127 StartRequest(&request, ResourceType::MAIN_FRAME); |
(...skipping 21 matching lines...) Expand all Loading... |
149 cases[i].name; | 149 cases[i].name; |
150 } else { | 150 } else { |
151 EXPECT_EQ(net::ERR_ADDRESS_UNREACHABLE, request.status().error()) << | 151 EXPECT_EQ(net::ERR_ADDRESS_UNREACHABLE, request.status().error()) << |
152 cases[i].name; | 152 cases[i].name; |
153 } | 153 } |
154 } | 154 } |
155 } | 155 } |
156 } | 156 } |
157 | 157 |
158 } // namespace | 158 } // namespace |
OLD | NEW |