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

Side by Side Diff: chrome/browser/captive_portal/captive_portal_browsertest.cc

Issue 567563002: Move url_request_failed_job to net/test/url_request/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix compile error Created 6 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
« no previous file with comments | « no previous file | chrome/browser/errorpage_browsertest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <map> 5 #include <map>
6 #include <set> 6 #include <set>
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 23 matching lines...) Expand all
34 #include "chrome/test/base/ui_test_utils.h" 34 #include "chrome/test/base/ui_test_utils.h"
35 #include "content/public/browser/browser_thread.h" 35 #include "content/public/browser/browser_thread.h"
36 #include "content/public/browser/navigation_controller.h" 36 #include "content/public/browser/navigation_controller.h"
37 #include "content/public/browser/notification_observer.h" 37 #include "content/public/browser/notification_observer.h"
38 #include "content/public/browser/notification_registrar.h" 38 #include "content/public/browser/notification_registrar.h"
39 #include "content/public/browser/notification_service.h" 39 #include "content/public/browser/notification_service.h"
40 #include "content/public/browser/notification_types.h" 40 #include "content/public/browser/notification_types.h"
41 #include "content/public/browser/render_frame_host.h" 41 #include "content/public/browser/render_frame_host.h"
42 #include "content/public/browser/web_contents.h" 42 #include "content/public/browser/web_contents.h"
43 #include "content/public/common/url_constants.h" 43 #include "content/public/common/url_constants.h"
44 #include "content/test/net/url_request_failed_job.h"
45 #include "net/base/net_errors.h" 44 #include "net/base/net_errors.h"
46 #include "net/http/transport_security_state.h" 45 #include "net/http/transport_security_state.h"
46 #include "net/test/url_request/url_request_failed_job.h"
47 #include "net/test/url_request/url_request_mock_http_job.h" 47 #include "net/test/url_request/url_request_mock_http_job.h"
48 #include "net/url_request/url_request.h" 48 #include "net/url_request/url_request.h"
49 #include "net/url_request/url_request_context.h" 49 #include "net/url_request/url_request_context.h"
50 #include "net/url_request/url_request_context_getter.h" 50 #include "net/url_request/url_request_context_getter.h"
51 #include "net/url_request/url_request_filter.h" 51 #include "net/url_request/url_request_filter.h"
52 #include "net/url_request/url_request_job.h" 52 #include "net/url_request/url_request_job.h"
53 #include "net/url_request/url_request_status.h" 53 #include "net/url_request/url_request_status.h"
54 #include "testing/gtest/include/gtest/gtest.h" 54 #include "testing/gtest/include/gtest/gtest.h"
55 55
56 using captive_portal::CaptivePortalResult; 56 using captive_portal::CaptivePortalResult;
57 using content::BrowserThread; 57 using content::BrowserThread;
58 using content::URLRequestFailedJob;
59 using content::WebContents; 58 using content::WebContents;
59 using net::URLRequestFailedJob;
60 using net::URLRequestMockHTTPJob; 60 using net::URLRequestMockHTTPJob;
61 61
62 namespace { 62 namespace {
63 63
64 // Path of the fake login page, when using the TestServer. 64 // Path of the fake login page, when using the TestServer.
65 const char* const kTestServerLoginPath = "files/captive_portal/login.html"; 65 const char* const kTestServerLoginPath = "files/captive_portal/login.html";
66 66
67 // Path of a page with an iframe that has a mock SSL timeout, when using the 67 // Path of a page with an iframe that has a mock SSL timeout, when using the
68 // TestServer. 68 // TestServer.
69 const char* const kTestServerIframeTimeoutPath = 69 const char* const kTestServerIframeTimeoutPath =
(...skipping 2134 matching lines...) Expand 10 before | Expand all | Expand 10 after
2204 content::BrowserThread::PostTask( 2204 content::BrowserThread::PostTask(
2205 content::BrowserThread::IO, FROM_HERE, 2205 content::BrowserThread::IO, FROM_HERE,
2206 base::Bind(&AddHstsHost, 2206 base::Bind(&AddHstsHost,
2207 make_scoped_refptr(browser()->profile()->GetRequestContext()), 2207 make_scoped_refptr(browser()->profile()->GetRequestContext()),
2208 http_timeout_url.host())); 2208 http_timeout_url.host()));
2209 2209
2210 SlowLoadBehindCaptivePortal(browser(), true, http_timeout_url, 1, 1); 2210 SlowLoadBehindCaptivePortal(browser(), true, http_timeout_url, 1, 1);
2211 Login(browser(), 1, 0); 2211 Login(browser(), 1, 0);
2212 FailLoadsAfterLogin(browser(), 1); 2212 FailLoadsAfterLogin(browser(), 1);
2213 } 2213 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/errorpage_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698