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

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

Issue 2864493002: Mark SSLUITest.TestOKHTTPS as not flaky (Closed)
Patch Set: Created 3 years, 7 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) 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 <utility> 5 #include <utility>
6 6
7 #include "base/base_switches.h" 7 #include "base/base_switches.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/bind_helpers.h" 9 #include "base/bind_helpers.h"
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 871 matching lines...) Expand 10 before | Expand all | Expand 10 after
882 histograms.ExpectTotalCount(decision_histogram, 2); 882 histograms.ExpectTotalCount(decision_histogram, 2);
883 histograms.ExpectBucketCount( 883 histograms.ExpectBucketCount(
884 decision_histogram, security_interstitials::MetricsHelper::DONT_PROCEED, 884 decision_histogram, security_interstitials::MetricsHelper::DONT_PROCEED,
885 1); 885 1);
886 histograms.ExpectTotalCount(interaction_histogram, 1); 886 histograms.ExpectTotalCount(interaction_histogram, 1);
887 histograms.ExpectBucketCount( 887 histograms.ExpectBucketCount(
888 interaction_histogram, 888 interaction_histogram,
889 security_interstitials::MetricsHelper::TOTAL_VISITS, 1); 889 security_interstitials::MetricsHelper::TOTAL_VISITS, 1);
890 } 890 }
891 891
892 // http://crbug.com/91745
893 #if defined(OS_CHROMEOS)
894 #define MAYBE_TestOKHTTPS DISABLED_TestOKHTTPS
895 #else
896 #define MAYBE_TestOKHTTPS TestOKHTTPS
897 #endif
898
899 // Visits a page over OK https: 892 // Visits a page over OK https:
900 IN_PROC_BROWSER_TEST_F(SSLUITest, MAYBE_TestOKHTTPS) { 893 IN_PROC_BROWSER_TEST_F(SSLUITest, TestOKHTTPS) {
901 ASSERT_TRUE(https_server_.Start()); 894 ASSERT_TRUE(https_server_.Start());
902 895
903 ui_test_utils::NavigateToURL(browser(), 896 ui_test_utils::NavigateToURL(browser(),
904 https_server_.GetURL("/ssl/google.html")); 897 https_server_.GetURL("/ssl/google.html"));
905 898
906 CheckAuthenticatedState(browser()->tab_strip_model()->GetActiveWebContents(), 899 CheckAuthenticatedState(browser()->tab_strip_model()->GetActiveWebContents(),
907 AuthState::NONE); 900 AuthState::NONE);
908 } 901 }
909 902
910 // Visits a page with https error and proceed: 903 // Visits a page with https error and proceed:
(...skipping 3516 matching lines...) Expand 10 before | Expand all | Expand 10 after
4427 4420
4428 // Visit a page over https that contains a frame with a redirect. 4421 // Visit a page over https that contains a frame with a redirect.
4429 4422
4430 // XMLHttpRequest insecure content in synchronous mode. 4423 // XMLHttpRequest insecure content in synchronous mode.
4431 4424
4432 // XMLHttpRequest insecure content in asynchronous mode. 4425 // XMLHttpRequest insecure content in asynchronous mode.
4433 4426
4434 // XMLHttpRequest over bad ssl in synchronous mode. 4427 // XMLHttpRequest over bad ssl in synchronous mode.
4435 4428
4436 // XMLHttpRequest over OK ssl in synchronous mode. 4429 // 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