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

Side by Side Diff: chrome/browser/ssl/ssl_browser_tests.cc

Issue 3452026: Attempt at fixing SSLUITest.TestUnsafeContents (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Synced Created 10 years, 2 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 | no next file » | 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/time.h" 5 #include "base/time.h"
6 #include "chrome/app/chrome_dll_resource.h" 6 #include "chrome/app/chrome_dll_resource.h"
7 #include "chrome/browser/browser.h" 7 #include "chrome/browser/browser.h"
8 #include "chrome/browser/prefs/pref_service.h" 8 #include "chrome/browser/prefs/pref_service.h"
9 #include "chrome/browser/profile.h" 9 #include "chrome/browser/profile.h"
10 #include "chrome/browser/tab_contents/interstitial_page.h" 10 #include "chrome/browser/tab_contents/interstitial_page.h"
(...skipping 361 matching lines...) Expand 10 before | Expand all | Expand 10 after
372 372
373 CheckAuthenticationBrokenState(browser()->GetSelectedTabContents(), 0, true, 373 CheckAuthenticationBrokenState(browser()->GetSelectedTabContents(), 0, true,
374 false); 374 false);
375 } 375 }
376 376
377 // Visits a page with unsafe content and make sure that: 377 // Visits a page with unsafe content and make sure that:
378 // - frames content is replaced with warning 378 // - frames content is replaced with warning
379 // - images and scripts are filtered out entirely 379 // - images and scripts are filtered out entirely
380 // Marked as flaky, see bug 40932. 380 // Marked as flaky, see bug 40932.
381 IN_PROC_BROWSER_TEST_F(SSLUITest, FLAKY_TestUnsafeContents) { 381 IN_PROC_BROWSER_TEST_F(SSLUITest, FLAKY_TestUnsafeContents) {
382 ASSERT_TRUE(test_server()->Start()); 382 ASSERT_TRUE(https_server_.Start());
383 ASSERT_TRUE(https_server_expired_.Start()); 383 ASSERT_TRUE(https_server_expired_.Start());
384 384
385 ui_test_utils::NavigateToURL(browser(), https_server_.GetURL( 385 ui_test_utils::NavigateToURL(browser(), https_server_.GetURL(
386 "files/ssl/page_with_unsafe_contents.html")); 386 "files/ssl/page_with_unsafe_contents.html"));
387 387
388 TabContents* tab = browser()->GetSelectedTabContents(); 388 TabContents* tab = browser()->GetSelectedTabContents();
389 // When the bad content is filtered, the state is expected to be 389 // When the bad content is filtered, the state is expected to be
390 // authenticated. 390 // authenticated.
391 CheckAuthenticatedState(tab, false); 391 CheckAuthenticatedState(tab, false);
392 392
(...skipping 558 matching lines...) Expand 10 before | Expand all | Expand 10 after
951 951
952 // Visit a page over https that contains a frame with a redirect. 952 // Visit a page over https that contains a frame with a redirect.
953 953
954 // XMLHttpRequest insecure content in synchronous mode. 954 // XMLHttpRequest insecure content in synchronous mode.
955 955
956 // XMLHttpRequest insecure content in asynchronous mode. 956 // XMLHttpRequest insecure content in asynchronous mode.
957 957
958 // XMLHttpRequest over bad ssl in synchronous mode. 958 // XMLHttpRequest over bad ssl in synchronous mode.
959 959
960 // XMLHttpRequest over OK ssl in synchronous mode. 960 // XMLHttpRequest over OK ssl in synchronous mode.
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698