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

Side by Side Diff: chrome/browser/extensions/extension_protocols_unittest.cc

Issue 10559036: Added URLRequestContext to constructor for URLRequest. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Updated unittests Created 8 years, 6 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
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 <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 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 net::URLRequestContext* request_context = 63 net::URLRequestContext* request_context =
64 resource_context_.GetRequestContext(); 64 resource_context_.GetRequestContext();
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 request->set_context(resource_context_.GetRequestContext());
74 request->Start(); 73 request->Start();
75 MessageLoop::current()->Run(); 74 MessageLoop::current()->Run();
76 } 75 }
77 76
78 protected: 77 protected:
79 MessageLoopForIO message_loop_; 78 MessageLoopForIO message_loop_;
80 content::TestBrowserThread ui_thread_; 79 content::TestBrowserThread ui_thread_;
81 content::TestBrowserThread file_thread_; 80 content::TestBrowserThread file_thread_;
82 content::TestBrowserThread io_thread_; 81 content::TestBrowserThread io_thread_;
83 scoped_refptr<ExtensionInfoMap> extension_info_map_; 82 scoped_refptr<ExtensionInfoMap> extension_info_map_;
(...skipping 29 matching lines...) Expand all
113 CreateTestExtension(cases[i].name, cases[i].incognito_split_mode); 112 CreateTestExtension(cases[i].name, cases[i].incognito_split_mode);
114 extension_info_map_->AddExtension( 113 extension_info_map_->AddExtension(
115 extension, base::Time::Now(), cases[i].incognito_enabled); 114 extension, base::Time::Now(), cases[i].incognito_enabled);
116 115
117 // First test a main frame request. 116 // First test a main frame request.
118 { 117 {
119 // It doesn't matter that the resource doesn't exist. If the resource 118 // It doesn't matter that the resource doesn't exist. If the resource
120 // is blocked, we should see ADDRESS_UNREACHABLE. Otherwise, the request 119 // is blocked, we should see ADDRESS_UNREACHABLE. Otherwise, the request
121 // should just fail because the file doesn't exist. 120 // should just fail because the file doesn't exist.
122 net::URLRequest request(extension->GetResourceURL("404.html"), 121 net::URLRequest request(extension->GetResourceURL("404.html"),
123 &test_delegate_); 122 &test_delegate_,
123 resource_context_.GetRequestContext());
124 StartRequest(&request, ResourceType::MAIN_FRAME); 124 StartRequest(&request, ResourceType::MAIN_FRAME);
125 EXPECT_EQ(net::URLRequestStatus::FAILED, request.status().status()); 125 EXPECT_EQ(net::URLRequestStatus::FAILED, request.status().status());
126 126
127 if (cases[i].should_allow_main_frame_load) { 127 if (cases[i].should_allow_main_frame_load) {
128 EXPECT_EQ(net::ERR_FILE_NOT_FOUND, request.status().error()) << 128 EXPECT_EQ(net::ERR_FILE_NOT_FOUND, request.status().error()) <<
129 cases[i].name; 129 cases[i].name;
130 } else { 130 } else {
131 EXPECT_EQ(net::ERR_ADDRESS_UNREACHABLE, request.status().error()) << 131 EXPECT_EQ(net::ERR_ADDRESS_UNREACHABLE, request.status().error()) <<
132 cases[i].name; 132 cases[i].name;
133 } 133 }
134 } 134 }
135 135
136 // Now do a subframe request. 136 // Now do a subframe request.
137 { 137 {
138 net::URLRequest request(extension->GetResourceURL("404.html"), 138 net::URLRequest request(extension->GetResourceURL("404.html"),
139 &test_delegate_); 139 &test_delegate_,
140 resource_context_.GetRequestContext());
140 StartRequest(&request, ResourceType::SUB_FRAME); 141 StartRequest(&request, ResourceType::SUB_FRAME);
141 EXPECT_EQ(net::URLRequestStatus::FAILED, request.status().status()); 142 EXPECT_EQ(net::URLRequestStatus::FAILED, request.status().status());
142 143
143 if (cases[i].should_allow_sub_frame_load) { 144 if (cases[i].should_allow_sub_frame_load) {
144 EXPECT_EQ(net::ERR_FILE_NOT_FOUND, request.status().error()) << 145 EXPECT_EQ(net::ERR_FILE_NOT_FOUND, request.status().error()) <<
145 cases[i].name; 146 cases[i].name;
146 } else { 147 } else {
147 EXPECT_EQ(net::ERR_ADDRESS_UNREACHABLE, request.status().error()) << 148 EXPECT_EQ(net::ERR_ADDRESS_UNREACHABLE, request.status().error()) <<
148 cases[i].name; 149 cases[i].name;
149 } 150 }
150 } 151 }
151 } 152 }
152 } 153 }
153 154
154 } // namespace 155 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698