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

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

Issue 11359217: Move scoped_temp_dir from base to base/files (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month 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/string_util.h" 7 #include "base/string_util.h"
8 #include "base/stringprintf.h" 8 #include "base/stringprintf.h"
9 #include "base/time.h" 9 #include "base/time.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
(...skipping 710 matching lines...) Expand 10 before | Expand all | Expand 10 after
721 // We should have an interstitial page showing. 721 // We should have an interstitial page showing.
722 ASSERT_TRUE(tab2->GetInterstitialPage()); 722 ASSERT_TRUE(tab2->GetInterstitialPage());
723 } 723 }
724 724
725 IN_PROC_BROWSER_TEST_F(SSLUITest, TestBadHTTPSDownload) { 725 IN_PROC_BROWSER_TEST_F(SSLUITest, TestBadHTTPSDownload) {
726 ASSERT_TRUE(test_server()->Start()); 726 ASSERT_TRUE(test_server()->Start());
727 ASSERT_TRUE(https_server_expired_.Start()); 727 ASSERT_TRUE(https_server_expired_.Start());
728 GURL url_non_dangerous = test_server()->GetURL(""); 728 GURL url_non_dangerous = test_server()->GetURL("");
729 GURL url_dangerous = https_server_expired_.GetURL( 729 GURL url_dangerous = https_server_expired_.GetURL(
730 "files/downloads/dangerous/dangerous.exe"); 730 "files/downloads/dangerous/dangerous.exe");
731 ScopedTempDir downloads_directory_; 731 base::ScopedTempDir downloads_directory_;
732 732
733 // Need empty temp dir to avoid having Chrome ask us for a new filename 733 // Need empty temp dir to avoid having Chrome ask us for a new filename
734 // when we've downloaded dangerous.exe one hundred times. 734 // when we've downloaded dangerous.exe one hundred times.
735 ASSERT_TRUE(downloads_directory_.CreateUniqueTempDir()); 735 ASSERT_TRUE(downloads_directory_.CreateUniqueTempDir());
736 736
737 browser()->profile()->GetPrefs()->SetFilePath( 737 browser()->profile()->GetPrefs()->SetFilePath(
738 prefs::kDownloadDefaultDirectory, 738 prefs::kDownloadDefaultDirectory,
739 downloads_directory_.path()); 739 downloads_directory_.path());
740 740
741 // Visit a non-dangerous page. 741 // Visit a non-dangerous page.
(...skipping 860 matching lines...) Expand 10 before | Expand all | Expand 10 after
1602 1602
1603 // Visit a page over https that contains a frame with a redirect. 1603 // Visit a page over https that contains a frame with a redirect.
1604 1604
1605 // XMLHttpRequest insecure content in synchronous mode. 1605 // XMLHttpRequest insecure content in synchronous mode.
1606 1606
1607 // XMLHttpRequest insecure content in asynchronous mode. 1607 // XMLHttpRequest insecure content in asynchronous mode.
1608 1608
1609 // XMLHttpRequest over bad ssl in synchronous mode. 1609 // XMLHttpRequest over bad ssl in synchronous mode.
1610 1610
1611 // XMLHttpRequest over OK ssl in synchronous mode. 1611 // XMLHttpRequest over OK ssl in synchronous mode.
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698