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

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

Issue 404693002: Test SSLUITest.TestWSSInvalidCertAndClose no longer leaks (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 5 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 "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/prefs/pref_service.h" 7 #include "base/prefs/pref_service.h"
8 #include "base/strings/string_util.h" 8 #include "base/strings/string_util.h"
9 #include "base/strings/stringprintf.h" 9 #include "base/strings/stringprintf.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 621 matching lines...) Expand 10 before | Expand all | Expand 10 after
632 CheckUnauthenticatedState(tab); 632 CheckUnauthenticatedState(tab);
633 EXPECT_FALSE(tab->GetController().CanGoForward()); 633 EXPECT_FALSE(tab->GetController().CanGoForward());
634 NavigationEntry* entry4 = tab->GetController().GetActiveEntry(); 634 NavigationEntry* entry4 = tab->GetController().GetActiveEntry();
635 EXPECT_TRUE(entry2 == entry4); 635 EXPECT_TRUE(entry2 == entry4);
636 } 636 }
637 637
638 // Visit a HTTP page which request WSS connection to a server providing invalid 638 // Visit a HTTP page which request WSS connection to a server providing invalid
639 // certificate. Close the page while WSS connection waits for SSLManager's 639 // certificate. Close the page while WSS connection waits for SSLManager's
640 // response from UI thread. 640 // response from UI thread.
641 // Disabled on Windows because it was flaking on XP Tests (1). crbug.com/165258 641 // Disabled on Windows because it was flaking on XP Tests (1). crbug.com/165258
642 // Disabled under LeakSanitizer due to memory leaks. http://crbug.com/317363 642 #if defined(OS_WIN)
643 #if defined(OS_WIN) || defined(LEAK_SANITIZER)
644 #define MAYBE_TestWSSInvalidCertAndClose DISABLED_TestWSSInvalidCertAndClose 643 #define MAYBE_TestWSSInvalidCertAndClose DISABLED_TestWSSInvalidCertAndClose
645 #else 644 #else
646 #define MAYBE_TestWSSInvalidCertAndClose TestWSSInvalidCertAndClose 645 #define MAYBE_TestWSSInvalidCertAndClose TestWSSInvalidCertAndClose
647 #endif 646 #endif
648 IN_PROC_BROWSER_TEST_F(SSLUITest, MAYBE_TestWSSInvalidCertAndClose) { 647 IN_PROC_BROWSER_TEST_F(SSLUITest, MAYBE_TestWSSInvalidCertAndClose) {
649 ASSERT_TRUE(test_server()->Start()); 648 ASSERT_TRUE(test_server()->Start());
650 ASSERT_TRUE(wss_server_expired_.Start()); 649 ASSERT_TRUE(wss_server_expired_.Start());
651 650
652 // Setup page title observer. 651 // Setup page title observer.
653 WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents(); 652 WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents();
(...skipping 1171 matching lines...) Expand 10 before | Expand all | Expand 10 after
1825 1824
1826 // Visit a page over https that contains a frame with a redirect. 1825 // Visit a page over https that contains a frame with a redirect.
1827 1826
1828 // XMLHttpRequest insecure content in synchronous mode. 1827 // XMLHttpRequest insecure content in synchronous mode.
1829 1828
1830 // XMLHttpRequest insecure content in asynchronous mode. 1829 // XMLHttpRequest insecure content in asynchronous mode.
1831 1830
1832 // XMLHttpRequest over bad ssl in synchronous mode. 1831 // XMLHttpRequest over bad ssl in synchronous mode.
1833 1832
1834 // XMLHttpRequest over OK ssl in synchronous mode. 1833 // 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