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

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

Issue 7846007: net: Rename URLRequestStatus::os_error_. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix os_error_code Created 9 years, 3 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) 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 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 ipc_sender_.PushTask( 162 ipc_sender_.PushTask(
163 NewRunnableFunction(&EventHandledOnIOThread, 163 NewRunnableFunction(&EventHandledOnIOThread,
164 &profile_, extension1_id, kEventName, kEventName + "/1", 164 &profile_, extension1_id, kEventName, kEventName + "/1",
165 request.identifier(), response)); 165 request.identifier(), response));
166 166
167 request.Start(); 167 request.Start();
168 MessageLoop::current()->Run(); 168 MessageLoop::current()->Run();
169 169
170 EXPECT_TRUE(!request.is_pending()); 170 EXPECT_TRUE(!request.is_pending());
171 EXPECT_EQ(net::URLRequestStatus::SUCCESS, request.status().status()); 171 EXPECT_EQ(net::URLRequestStatus::SUCCESS, request.status().status());
172 EXPECT_EQ(0, request.status().os_error()); 172 EXPECT_EQ(0, request.status().error());
173 EXPECT_EQ(redirect_url, request.url()); 173 EXPECT_EQ(redirect_url, request.url());
174 EXPECT_EQ(2U, request.url_chain().size()); 174 EXPECT_EQ(2U, request.url_chain().size());
175 EXPECT_EQ(0U, ipc_sender_.GetNumTasks()); 175 EXPECT_EQ(0U, ipc_sender_.GetNumTasks());
176 } 176 }
177 177
178 // Now test the same thing but the extensions answer in reverse order. 178 // Now test the same thing but the extensions answer in reverse order.
179 net::URLRequest request2(GURL("about:blank"), &delegate_); 179 net::URLRequest request2(GURL("about:blank"), &delegate_);
180 request2.set_context(context_); 180 request2.set_context(context_);
181 { 181 {
182 ExtensionWebRequestEventRouter::EventResponse* response = NULL; 182 ExtensionWebRequestEventRouter::EventResponse* response = NULL;
(...skipping 30 matching lines...) Expand all
213 ipc_sender_.PushTask( 213 ipc_sender_.PushTask(
214 NewRunnableFunction(&EventHandledOnIOThread, 214 NewRunnableFunction(&EventHandledOnIOThread,
215 &profile_, extension1_id, kEventName, kEventName + "/1", 215 &profile_, extension1_id, kEventName, kEventName + "/1",
216 request2.identifier(), response)); 216 request2.identifier(), response));
217 217
218 request2.Start(); 218 request2.Start();
219 MessageLoop::current()->Run(); 219 MessageLoop::current()->Run();
220 220
221 EXPECT_TRUE(!request2.is_pending()); 221 EXPECT_TRUE(!request2.is_pending());
222 EXPECT_EQ(net::URLRequestStatus::SUCCESS, request2.status().status()); 222 EXPECT_EQ(net::URLRequestStatus::SUCCESS, request2.status().status());
223 EXPECT_EQ(0, request2.status().os_error()); 223 EXPECT_EQ(0, request2.status().error());
224 EXPECT_EQ(redirect_url, request2.url()); 224 EXPECT_EQ(redirect_url, request2.url());
225 EXPECT_EQ(2U, request2.url_chain().size()); 225 EXPECT_EQ(2U, request2.url_chain().size());
226 EXPECT_EQ(0U, ipc_sender_.GetNumTasks()); 226 EXPECT_EQ(0U, ipc_sender_.GetNumTasks());
227 } 227 }
228 228
229 ExtensionWebRequestEventRouter::GetInstance()->RemoveEventListener( 229 ExtensionWebRequestEventRouter::GetInstance()->RemoveEventListener(
230 &profile_, extension1_id, kEventName + "/1"); 230 &profile_, extension1_id, kEventName + "/1");
231 ExtensionWebRequestEventRouter::GetInstance()->RemoveEventListener( 231 ExtensionWebRequestEventRouter::GetInstance()->RemoveEventListener(
232 &profile_, extension2_id, kEventName + "/2"); 232 &profile_, extension2_id, kEventName + "/2");
233 } 233 }
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
277 ipc_sender_.PushTask( 277 ipc_sender_.PushTask(
278 NewRunnableFunction(&EventHandledOnIOThread, 278 NewRunnableFunction(&EventHandledOnIOThread,
279 &profile_, extension2_id, kEventName, kEventName + "/2", 279 &profile_, extension2_id, kEventName, kEventName + "/2",
280 request.identifier(), response)); 280 request.identifier(), response));
281 281
282 request.Start(); 282 request.Start();
283 MessageLoop::current()->Run(); 283 MessageLoop::current()->Run();
284 284
285 EXPECT_TRUE(!request.is_pending()); 285 EXPECT_TRUE(!request.is_pending());
286 EXPECT_EQ(net::URLRequestStatus::FAILED, request.status().status()); 286 EXPECT_EQ(net::URLRequestStatus::FAILED, request.status().status());
287 EXPECT_EQ(net::ERR_EMPTY_RESPONSE, request.status().os_error()); 287 EXPECT_EQ(net::ERR_EMPTY_RESPONSE, request.status().error());
288 EXPECT_EQ(request_url, request.url()); 288 EXPECT_EQ(request_url, request.url());
289 EXPECT_EQ(1U, request.url_chain().size()); 289 EXPECT_EQ(1U, request.url_chain().size());
290 EXPECT_EQ(0U, ipc_sender_.GetNumTasks()); 290 EXPECT_EQ(0U, ipc_sender_.GetNumTasks());
291 291
292 ExtensionWebRequestEventRouter::GetInstance()->RemoveEventListener( 292 ExtensionWebRequestEventRouter::GetInstance()->RemoveEventListener(
293 &profile_, extension1_id, kEventName + "/1"); 293 &profile_, extension1_id, kEventName + "/1");
294 ExtensionWebRequestEventRouter::GetInstance()->RemoveEventListener( 294 ExtensionWebRequestEventRouter::GetInstance()->RemoveEventListener(
295 &profile_, extension2_id, kEventName + "/2"); 295 &profile_, extension2_id, kEventName + "/2");
296 } 296 }
297 297
(...skipping 345 matching lines...) Expand 10 before | Expand all | Expand 10 after
643 {"header2", "bar"} } 643 {"header2", "bar"} }
644 }, 644 },
645 }; 645 };
646 646
647 INSTANTIATE_TEST_CASE_P( 647 INSTANTIATE_TEST_CASE_P(
648 ExtensionWebRequest, 648 ExtensionWebRequest,
649 ExtensionWebRequestHeaderModificationTest, 649 ExtensionWebRequestHeaderModificationTest,
650 ::testing::ValuesIn(kTests)); 650 ::testing::ValuesIn(kTests));
651 651
652 } // namespace 652 } // namespace
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_webrequest_api.cc ('k') | chrome/browser/net/chrome_dns_cert_provenance_checker.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698