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 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
65 request_context->set_job_factory(old_factory_); | 65 request_context->set_job_factory(old_factory_); |
66 } | 66 } |
67 | 67 |
68 void StartRequest(net::URLRequest* request, | 68 void StartRequest(net::URLRequest* request, |
69 ResourceType::Type resource_type) { | 69 ResourceType::Type resource_type) { |
70 content::ResourceRequestInfo::AllocateForTesting(request, | 70 content::ResourceRequestInfo::AllocateForTesting(request, |
71 resource_type, | 71 resource_type, |
72 &resource_context_, | 72 &resource_context_, |
73 -1, | 73 -1, |
74 -1); | 74 -1); |
75 request->set_context(resource_context_.GetRequestContext()); | |
76 request->Start(); | 75 request->Start(); |
77 MessageLoop::current()->Run(); | 76 MessageLoop::current()->Run(); |
78 } | 77 } |
79 | 78 |
80 protected: | 79 protected: |
81 MessageLoopForIO message_loop_; | 80 MessageLoopForIO message_loop_; |
82 content::TestBrowserThread ui_thread_; | 81 content::TestBrowserThread ui_thread_; |
83 content::TestBrowserThread file_thread_; | 82 content::TestBrowserThread file_thread_; |
84 content::TestBrowserThread io_thread_; | 83 content::TestBrowserThread io_thread_; |
85 scoped_refptr<ExtensionInfoMap> extension_info_map_; | 84 scoped_refptr<ExtensionInfoMap> extension_info_map_; |
(...skipping 29 matching lines...) Expand all Loading... |
115 CreateTestExtension(cases[i].name, cases[i].incognito_split_mode); | 114 CreateTestExtension(cases[i].name, cases[i].incognito_split_mode); |
116 extension_info_map_->AddExtension( | 115 extension_info_map_->AddExtension( |
117 extension, base::Time::Now(), cases[i].incognito_enabled); | 116 extension, base::Time::Now(), cases[i].incognito_enabled); |
118 | 117 |
119 // First test a main frame request. | 118 // First test a main frame request. |
120 { | 119 { |
121 // It doesn't matter that the resource doesn't exist. If the resource | 120 // It doesn't matter that the resource doesn't exist. If the resource |
122 // is blocked, we should see ADDRESS_UNREACHABLE. Otherwise, the request | 121 // is blocked, we should see ADDRESS_UNREACHABLE. Otherwise, the request |
123 // should just fail because the file doesn't exist. | 122 // should just fail because the file doesn't exist. |
124 net::URLRequest request(extension->GetResourceURL("404.html"), | 123 net::URLRequest request(extension->GetResourceURL("404.html"), |
125 &test_delegate_); | 124 &test_delegate_, |
| 125 resource_context_.GetRequestContext()); |
126 StartRequest(&request, ResourceType::MAIN_FRAME); | 126 StartRequest(&request, ResourceType::MAIN_FRAME); |
127 EXPECT_EQ(net::URLRequestStatus::FAILED, request.status().status()); | 127 EXPECT_EQ(net::URLRequestStatus::FAILED, request.status().status()); |
128 | 128 |
129 if (cases[i].should_allow_main_frame_load) { | 129 if (cases[i].should_allow_main_frame_load) { |
130 EXPECT_EQ(net::ERR_FILE_NOT_FOUND, request.status().error()) << | 130 EXPECT_EQ(net::ERR_FILE_NOT_FOUND, request.status().error()) << |
131 cases[i].name; | 131 cases[i].name; |
132 } else { | 132 } else { |
133 EXPECT_EQ(net::ERR_ADDRESS_UNREACHABLE, request.status().error()) << | 133 EXPECT_EQ(net::ERR_ADDRESS_UNREACHABLE, request.status().error()) << |
134 cases[i].name; | 134 cases[i].name; |
135 } | 135 } |
136 } | 136 } |
137 | 137 |
138 // Now do a subframe request. | 138 // Now do a subframe request. |
139 { | 139 { |
140 net::URLRequest request(extension->GetResourceURL("404.html"), | 140 net::URLRequest request(extension->GetResourceURL("404.html"), |
141 &test_delegate_); | 141 &test_delegate_, |
| 142 resource_context_.GetRequestContext()); |
142 StartRequest(&request, ResourceType::SUB_FRAME); | 143 StartRequest(&request, ResourceType::SUB_FRAME); |
143 EXPECT_EQ(net::URLRequestStatus::FAILED, request.status().status()); | 144 EXPECT_EQ(net::URLRequestStatus::FAILED, request.status().status()); |
144 | 145 |
145 if (cases[i].should_allow_sub_frame_load) { | 146 if (cases[i].should_allow_sub_frame_load) { |
146 EXPECT_EQ(net::ERR_FILE_NOT_FOUND, request.status().error()) << | 147 EXPECT_EQ(net::ERR_FILE_NOT_FOUND, request.status().error()) << |
147 cases[i].name; | 148 cases[i].name; |
148 } else { | 149 } else { |
149 EXPECT_EQ(net::ERR_ADDRESS_UNREACHABLE, request.status().error()) << | 150 EXPECT_EQ(net::ERR_ADDRESS_UNREACHABLE, request.status().error()) << |
150 cases[i].name; | 151 cases[i].name; |
151 } | 152 } |
152 } | 153 } |
153 } | 154 } |
154 } | 155 } |
155 | 156 |
156 } // namespace | 157 } // namespace |
OLD | NEW |