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

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

Issue 10778044: Always enable dom automation for browser_tests. This avoids developers having to call EnableDOMAuto… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 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 | 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 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 typedef net::TestServer::HTTPSOptions HTTPSOptions; 80 typedef net::TestServer::HTTPSOptions HTTPSOptions;
81 81
82 public: 82 public:
83 SSLUITest() 83 SSLUITest()
84 : https_server_( 84 : https_server_(
85 HTTPSOptions(HTTPSOptions::CERT_OK), FilePath(kDocRoot)), 85 HTTPSOptions(HTTPSOptions::CERT_OK), FilePath(kDocRoot)),
86 https_server_expired_( 86 https_server_expired_(
87 HTTPSOptions(HTTPSOptions::CERT_EXPIRED), FilePath(kDocRoot)), 87 HTTPSOptions(HTTPSOptions::CERT_EXPIRED), FilePath(kDocRoot)),
88 https_server_mismatched_( 88 https_server_mismatched_(
89 HTTPSOptions(HTTPSOptions::CERT_MISMATCHED_NAME), 89 HTTPSOptions(HTTPSOptions::CERT_MISMATCHED_NAME),
90 FilePath(kDocRoot)) { 90 FilePath(kDocRoot)) {}
91 EnableDOMAutomation();
92 }
93 91
94 virtual void SetUpCommandLine(CommandLine* command_line) { 92 virtual void SetUpCommandLine(CommandLine* command_line) {
95 // Browser will both run and display insecure content. 93 // Browser will both run and display insecure content.
96 command_line->AppendSwitch(switches::kAllowRunningInsecureContent); 94 command_line->AppendSwitch(switches::kAllowRunningInsecureContent);
97 // Use process-per-site so that navigating to a same-site page in a 95 // Use process-per-site so that navigating to a same-site page in a
98 // new tab will use the same process. 96 // new tab will use the same process.
99 command_line->AppendSwitch(switches::kProcessPerSite); 97 command_line->AppendSwitch(switches::kProcessPerSite);
100 } 98 }
101 99
102 void CheckAuthenticatedState(WebContents* tab, 100 void CheckAuthenticatedState(WebContents* tab,
(...skipping 1352 matching lines...) Expand 10 before | Expand all | Expand 10 after
1455 1453
1456 // Visit a page over https that contains a frame with a redirect. 1454 // Visit a page over https that contains a frame with a redirect.
1457 1455
1458 // XMLHttpRequest insecure content in synchronous mode. 1456 // XMLHttpRequest insecure content in synchronous mode.
1459 1457
1460 // XMLHttpRequest insecure content in asynchronous mode. 1458 // XMLHttpRequest insecure content in asynchronous mode.
1461 1459
1462 // XMLHttpRequest over bad ssl in synchronous mode. 1460 // XMLHttpRequest over bad ssl in synchronous mode.
1463 1461
1464 // XMLHttpRequest over OK ssl in synchronous mode. 1462 // XMLHttpRequest over OK ssl in synchronous mode.
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698