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 "base/bind.h" | 5 #include "base/bind.h" |
6 #include "base/bind_helpers.h" | 6 #include "base/bind_helpers.h" |
7 #include "base/callback.h" | 7 #include "base/callback.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/location.h" | 9 #include "base/location.h" |
10 #include "base/metrics/field_trial.h" | 10 #include "base/metrics/field_trial.h" |
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
95 return; | 95 return; |
96 | 96 |
97 waiting_ = true; | 97 waiting_ = true; |
98 content::RunMessageLoop(); | 98 content::RunMessageLoop(); |
99 } | 99 } |
100 | 100 |
101 void DidFailProvisionalLoad( | 101 void DidFailProvisionalLoad( |
102 content::RenderFrameHost* render_frame_host, | 102 content::RenderFrameHost* render_frame_host, |
103 const GURL& validated_url, | 103 const GURL& validated_url, |
104 int error_code, | 104 int error_code, |
105 const base::string16& error_description) override { | 105 const base::string16& error_description, |
| 106 bool was_ignored_by_handler) override { |
106 seen_ = true; | 107 seen_ = true; |
107 if (waiting_) | 108 if (waiting_) |
108 base::MessageLoopForUI::current()->Quit(); | 109 base::MessageLoopForUI::current()->Quit(); |
109 } | 110 } |
110 | 111 |
111 private: | 112 private: |
112 bool waiting_; | 113 bool waiting_; |
113 bool seen_; | 114 bool seen_; |
114 }; | 115 }; |
115 | 116 |
(...skipping 2130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2246 | 2247 |
2247 // Visit a page over https that contains a frame with a redirect. | 2248 // Visit a page over https that contains a frame with a redirect. |
2248 | 2249 |
2249 // XMLHttpRequest insecure content in synchronous mode. | 2250 // XMLHttpRequest insecure content in synchronous mode. |
2250 | 2251 |
2251 // XMLHttpRequest insecure content in asynchronous mode. | 2252 // XMLHttpRequest insecure content in asynchronous mode. |
2252 | 2253 |
2253 // XMLHttpRequest over bad ssl in synchronous mode. | 2254 // XMLHttpRequest over bad ssl in synchronous mode. |
2254 | 2255 |
2255 // XMLHttpRequest over OK ssl in synchronous mode. | 2256 // XMLHttpRequest over OK ssl in synchronous mode. |
OLD | NEW |