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/command_line.h" | 5 #include "base/command_line.h" |
6 #include "base/path_service.h" | 6 #include "base/path_service.h" |
7 #include "base/string_util.h" | 7 #include "base/string_util.h" |
8 #include "base/stringprintf.h" | 8 #include "base/stringprintf.h" |
9 #include "base/time.h" | 9 #include "base/time.h" |
10 #include "base/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
53 | 53 |
54 waiting_ = true; | 54 waiting_ = true; |
55 ui_test_utils::RunMessageLoop(); | 55 ui_test_utils::RunMessageLoop(); |
56 } | 56 } |
57 | 57 |
58 void DidFailProvisionalLoad( | 58 void DidFailProvisionalLoad( |
59 int64 frame_id, | 59 int64 frame_id, |
60 bool is_main_frame, | 60 bool is_main_frame, |
61 const GURL& validated_url, | 61 const GURL& validated_url, |
62 int error_code, | 62 int error_code, |
63 const string16& error_description) OVERRIDE { | 63 const string16& error_description, |
| 64 content::RenderViewHost* render_view_host) OVERRIDE { |
64 seen_ = true; | 65 seen_ = true; |
65 if (waiting_) | 66 if (waiting_) |
66 MessageLoopForUI::current()->Quit(); | 67 MessageLoopForUI::current()->Quit(); |
67 } | 68 } |
68 | 69 |
69 private: | 70 private: |
70 bool waiting_; | 71 bool waiting_; |
71 bool seen_; | 72 bool seen_; |
72 }; | 73 }; |
73 | 74 |
(...skipping 1334 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1408 | 1409 |
1409 // Visit a page over https that contains a frame with a redirect. | 1410 // Visit a page over https that contains a frame with a redirect. |
1410 | 1411 |
1411 // XMLHttpRequest insecure content in synchronous mode. | 1412 // XMLHttpRequest insecure content in synchronous mode. |
1412 | 1413 |
1413 // XMLHttpRequest insecure content in asynchronous mode. | 1414 // XMLHttpRequest insecure content in asynchronous mode. |
1414 | 1415 |
1415 // XMLHttpRequest over bad ssl in synchronous mode. | 1416 // XMLHttpRequest over bad ssl in synchronous mode. |
1416 | 1417 |
1417 // XMLHttpRequest over OK ssl in synchronous mode. | 1418 // XMLHttpRequest over OK ssl in synchronous mode. |
OLD | NEW |