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 198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
209 ASSERT_TRUE(interstitial_page); | 209 ASSERT_TRUE(interstitial_page); |
210 content::WindowedNotificationObserver observer( | 210 content::WindowedNotificationObserver observer( |
211 content::NOTIFICATION_LOAD_STOP, | 211 content::NOTIFICATION_LOAD_STOP, |
212 content::Source<NavigationController>(&tab->GetController())); | 212 content::Source<NavigationController>(&tab->GetController())); |
213 interstitial_page->Proceed(); | 213 interstitial_page->Proceed(); |
214 observer.Wait(); | 214 observer.Wait(); |
215 } | 215 } |
216 | 216 |
217 size_t GetConstrainedWindowCount() const { | 217 size_t GetConstrainedWindowCount() const { |
218 return ConstrainedWindowTabHelper::FromWebContents( | 218 return ConstrainedWindowTabHelper::FromWebContents( |
219 chrome::GetActiveWebContents(browser()))->constrained_window_count(); | 219 chrome::GetActiveWebContents(browser()))->dialog_count(); |
220 } | 220 } |
221 | 221 |
222 static bool GetFilePathWithHostAndPortReplacement( | 222 static bool GetFilePathWithHostAndPortReplacement( |
223 const std::string& original_file_path, | 223 const std::string& original_file_path, |
224 const net::HostPortPair& host_port_pair, | 224 const net::HostPortPair& host_port_pair, |
225 std::string* replacement_path) { | 225 std::string* replacement_path) { |
226 std::vector<net::TestServer::StringPair> replacement_text; | 226 std::vector<net::TestServer::StringPair> replacement_text; |
227 replacement_text.push_back( | 227 replacement_text.push_back( |
228 make_pair("REPLACE_WITH_HOST_AND_PORT", host_port_pair.ToString())); | 228 make_pair("REPLACE_WITH_HOST_AND_PORT", host_port_pair.ToString())); |
229 return net::TestServer::GetFilePathWithReplacements( | 229 return net::TestServer::GetFilePathWithReplacements( |
(...skipping 1377 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1607 | 1607 |
1608 // Visit a page over https that contains a frame with a redirect. | 1608 // Visit a page over https that contains a frame with a redirect. |
1609 | 1609 |
1610 // XMLHttpRequest insecure content in synchronous mode. | 1610 // XMLHttpRequest insecure content in synchronous mode. |
1611 | 1611 |
1612 // XMLHttpRequest insecure content in asynchronous mode. | 1612 // XMLHttpRequest insecure content in asynchronous mode. |
1613 | 1613 |
1614 // XMLHttpRequest over bad ssl in synchronous mode. | 1614 // XMLHttpRequest over bad ssl in synchronous mode. |
1615 | 1615 |
1616 // XMLHttpRequest over OK ssl in synchronous mode. | 1616 // XMLHttpRequest over OK ssl in synchronous mode. |
OLD | NEW |