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

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

Issue 13145003: Rewrite std::string("") to std::string(), Linux edition. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Ugh Created 7 years, 8 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 | Annotate | Revision Log
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/string_util.h" 8 #include "base/string_util.h"
9 #include "base/stringprintf.h" 9 #include "base/stringprintf.h"
10 #include "base/time.h" 10 #include "base/time.h"
(...skipping 720 matching lines...) Expand 10 before | Expand all | Expand 10 after
731 // Verify our assumption that there was no prior navigation. 731 // Verify our assumption that there was no prior navigation.
732 EXPECT_FALSE(chrome::CanGoBack(browser())); 732 EXPECT_FALSE(chrome::CanGoBack(browser()));
733 733
734 // We should have an interstitial page showing. 734 // We should have an interstitial page showing.
735 ASSERT_TRUE(tab2->GetInterstitialPage()); 735 ASSERT_TRUE(tab2->GetInterstitialPage());
736 } 736 }
737 737
738 IN_PROC_BROWSER_TEST_F(SSLUITest, TestBadHTTPSDownload) { 738 IN_PROC_BROWSER_TEST_F(SSLUITest, TestBadHTTPSDownload) {
739 ASSERT_TRUE(test_server()->Start()); 739 ASSERT_TRUE(test_server()->Start());
740 ASSERT_TRUE(https_server_expired_.Start()); 740 ASSERT_TRUE(https_server_expired_.Start());
741 GURL url_non_dangerous = test_server()->GetURL(""); 741 GURL url_non_dangerous = test_server()->GetURL(std::string());
742 GURL url_dangerous = https_server_expired_.GetURL( 742 GURL url_dangerous =
743 "files/downloads/dangerous/dangerous.exe"); 743 https_server_expired_.GetURL("files/downloads/dangerous/dangerous.exe");
744 base::ScopedTempDir downloads_directory_; 744 base::ScopedTempDir downloads_directory_;
745 745
746 // Need empty temp dir to avoid having Chrome ask us for a new filename 746 // Need empty temp dir to avoid having Chrome ask us for a new filename
747 // when we've downloaded dangerous.exe one hundred times. 747 // when we've downloaded dangerous.exe one hundred times.
748 ASSERT_TRUE(downloads_directory_.CreateUniqueTempDir()); 748 ASSERT_TRUE(downloads_directory_.CreateUniqueTempDir());
749 749
750 browser()->profile()->GetPrefs()->SetFilePath( 750 browser()->profile()->GetPrefs()->SetFilePath(
751 prefs::kDownloadDefaultDirectory, 751 prefs::kDownloadDefaultDirectory,
752 downloads_directory_.path()); 752 downloads_directory_.path());
753 753
(...skipping 875 matching lines...) Expand 10 before | Expand all | Expand 10 after
1629 1629
1630 // Visit a page over https that contains a frame with a redirect. 1630 // Visit a page over https that contains a frame with a redirect.
1631 1631
1632 // XMLHttpRequest insecure content in synchronous mode. 1632 // XMLHttpRequest insecure content in synchronous mode.
1633 1633
1634 // XMLHttpRequest insecure content in asynchronous mode. 1634 // XMLHttpRequest insecure content in asynchronous mode.
1635 1635
1636 // XMLHttpRequest over bad ssl in synchronous mode. 1636 // XMLHttpRequest over bad ssl in synchronous mode.
1637 1637
1638 // XMLHttpRequest over OK ssl in synchronous mode. 1638 // XMLHttpRequest over OK ssl in synchronous mode.
OLDNEW
« no previous file with comments | « chrome/browser/ssl/ssl_blocking_page.cc ('k') | chrome/browser/storage_monitor/media_storage_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698