| OLD | NEW |
| 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 "base/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "base/time.h" | 6 #include "base/time.h" |
| 7 #include "chrome/app/chrome_command_ids.h" | 7 #include "chrome/app/chrome_command_ids.h" |
| 8 #include "chrome/browser/tabs/tab_strip_model.h" | 8 #include "chrome/browser/tabs/tab_strip_model.h" |
| 9 #include "chrome/browser/ui/browser.h" | 9 #include "chrome/browser/ui/browser.h" |
| 10 #include "chrome/browser/ui/browser_navigator.h" | 10 #include "chrome/browser/ui/browser_navigator.h" |
| (...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 215 DISALLOW_COPY_AND_ASSIGN(SSLUITest); | 215 DISALLOW_COPY_AND_ASSIGN(SSLUITest); |
| 216 }; | 216 }; |
| 217 | 217 |
| 218 class SSLUITestBlock : public SSLUITest { | 218 class SSLUITestBlock : public SSLUITest { |
| 219 public: | 219 public: |
| 220 SSLUITestBlock() : SSLUITest() {} | 220 SSLUITestBlock() : SSLUITest() {} |
| 221 | 221 |
| 222 // Browser will neither run nor display insecure content. | 222 // Browser will neither run nor display insecure content. |
| 223 virtual void SetUpCommandLine(CommandLine* command_line) { | 223 virtual void SetUpCommandLine(CommandLine* command_line) { |
| 224 command_line->AppendSwitch(switches::kNoDisplayingInsecureContent); | 224 command_line->AppendSwitch(switches::kNoDisplayingInsecureContent); |
| 225 command_line->AppendSwitch(switches::kNoRunningInsecureContent); |
| 225 } | 226 } |
| 226 }; | 227 }; |
| 227 | 228 |
| 228 // Visits a regular page over http. | 229 // Visits a regular page over http. |
| 229 IN_PROC_BROWSER_TEST_F(SSLUITest, TestHTTP) { | 230 IN_PROC_BROWSER_TEST_F(SSLUITest, TestHTTP) { |
| 230 ASSERT_TRUE(test_server()->Start()); | 231 ASSERT_TRUE(test_server()->Start()); |
| 231 | 232 |
| 232 ui_test_utils::NavigateToURL(browser(), | 233 ui_test_utils::NavigateToURL(browser(), |
| 233 test_server()->GetURL("files/ssl/google.html")); | 234 test_server()->GetURL("files/ssl/google.html")); |
| 234 | 235 |
| (...skipping 1062 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1297 | 1298 |
| 1298 // Visit a page over https that contains a frame with a redirect. | 1299 // Visit a page over https that contains a frame with a redirect. |
| 1299 | 1300 |
| 1300 // XMLHttpRequest insecure content in synchronous mode. | 1301 // XMLHttpRequest insecure content in synchronous mode. |
| 1301 | 1302 |
| 1302 // XMLHttpRequest insecure content in asynchronous mode. | 1303 // XMLHttpRequest insecure content in asynchronous mode. |
| 1303 | 1304 |
| 1304 // XMLHttpRequest over bad ssl in synchronous mode. | 1305 // XMLHttpRequest over bad ssl in synchronous mode. |
| 1305 | 1306 |
| 1306 // XMLHttpRequest over OK ssl in synchronous mode. | 1307 // XMLHttpRequest over OK ssl in synchronous mode. |
| OLD | NEW |