diff options
| author | tsepez@chromium.org <tsepez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-17 16:58:04 +0000 |
|---|---|---|
| committer | tsepez@chromium.org <tsepez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-17 16:58:04 +0000 |
| commit | d0d18c4018f2b9ecf06b0f6653022355fa9a33fb (patch) | |
| tree | 27358cb96767929210571466a1babf1b206ed313 | |
| parent | 62b9174525dc510d7e039277cf85679662a299e5 (diff) | |
| download | chromium_src-d0d18c4018f2b9ecf06b0f6653022355fa9a33fb.zip chromium_src-d0d18c4018f2b9ecf06b0f6653022355fa9a33fb.tar.gz chromium_src-d0d18c4018f2b9ecf06b0f6653022355fa9a33fb.tar.bz2 | |
Merge 105673 - Make SSLUITestBlock() robust regardless of default mixed content blocking setting. Precursor to re-landing mixed content blocking changes.
Review URL: http://codereview.chromium.org/8296006
TBR=tsepez@chromium.org
Review URL: http://codereview.chromium.org/8294011
git-svn-id: svn://svn.chromium.org/chrome/branches/874/src@105826 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/ssl/ssl_browser_tests.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc index 59b3712..c95c3d2 100644 --- a/chrome/browser/ssl/ssl_browser_tests.cc +++ b/chrome/browser/ssl/ssl_browser_tests.cc @@ -215,6 +215,7 @@ class SSLUITestBlock : public SSLUITest { // Browser will neither run nor display insecure content. virtual void SetUpCommandLine(CommandLine* command_line) { command_line->AppendSwitch(switches::kNoDisplayingInsecureContent); + command_line->AppendSwitch(switches::kNoRunningInsecureContent); } }; |