Add MarkHttpAsDangerous test and correct other MarkNonSecureAs tests

chrome/browser/ssl/ssl_browser_tests.cc

Index: chrome/browser/ssl/ssl_browser_tests.cc
diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc
index fe83aa907a7652395726717625abc553a385ffba..366f7b2204e9f41840c197c83254b36f0842a6a3 100644
--- a/chrome/browser/ssl/ssl_browser_tests.cc
+++ b/chrome/browser/ssl/ssl_browser_tests.cc
@@ -699,6 +699,17 @@ class SSLUITest : public InProcessBrowserTest {
   DISALLOW_COPY_AND_ASSIGN(SSLUITest);
 };
 
+class SSLUITestIgnoringFieldTrialConfig : public SSLUITest {

[estark, 2017/06/05 21:07:33]

I think we should do what you've done here, but also delete the MarkNonSecureAs
config from fieldtrial_testing_config.json. I say that because it's testing an
old config that's no longer used (it's the default now) so we don't need it
anymore and should delete it. But we will probably replace it soon with a Phase
2 config, so I think it's good to keep the changes you've made to these tests so
that we don't introduce the same problem again.

[elawrence, 2017/06/05 21:42:44]

Done.

+ public:
+  SSLUITestIgnoringFieldTrialConfig() : SSLUITest() {}
+
+  void SetUpCommandLine(base::CommandLine* command_line) override {
+    // Ensure that fieldtrial_testing_config.json does not interfere.
+    command_line->AppendSwitch(
+        variations::switches::kDisableFieldTrialTestingConfig);
+  }
+};
+
 class SSLUITestBlock : public SSLUITest {
  public:
   SSLUITestBlock() : SSLUITest() {}
@@ -1309,7 +1320,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestWSSInvalidCertAndGoForward) {
 
 // Ensure that non-standard origins are marked correctly when the
 // MarkNonSecureAs field trial is enabled.
-IN_PROC_BROWSER_TEST_F(SSLUITest, MarkFileAsNonSecure) {
+IN_PROC_BROWSER_TEST_F(SSLUITestIgnoringFieldTrialConfig, MarkFileAsNonSecure) {
   scoped_refptr<base::FieldTrial> trial =

[estark, 2017/06/05 21:07:33]

nit: maybe ASSERT_TRUE(trial) after each of these? It looks like this returns
null if the field trial already exists.

[elawrence, 2017/06/05 21:44:51]

Done; though using the more explicit (x!=nullptr) to match surrounding code and
the Google Test style.

       base::FieldTrialList::CreateFieldTrial(
           "MarkNonSecureAs", security_state::switches::kMarkHttpAsDangerous);
@@ -1328,7 +1339,8 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, MarkFileAsNonSecure) {
   EXPECT_EQ(security_state::NONE, security_info.security_level);
 }
 
-IN_PROC_BROWSER_TEST_F(SSLUITest, MarkAboutAsNonSecure) {
+IN_PROC_BROWSER_TEST_F(SSLUITestIgnoringFieldTrialConfig,
+                       MarkAboutAsNonSecure) {
   scoped_refptr<base::FieldTrial> trial =
       base::FieldTrialList::CreateFieldTrial(
           "MarkNonSecureAs", security_state::switches::kMarkHttpAsDangerous);
@@ -1363,7 +1375,27 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, MarkDataAsNonSecure) {
   EXPECT_EQ(security_state::HTTP_SHOW_WARNING, security_info.security_level);
 }
 
-IN_PROC_BROWSER_TEST_F(SSLUITest, MarkBlobAsNonSecure) {
+// Ensure that HTTP origins are marked correctly when the MarkNonSecureAs field
+// trial is set to MarkHttpAsDangerous.
+IN_PROC_BROWSER_TEST_F(SSLUITestIgnoringFieldTrialConfig, MarkHTTPAsDangerous) {
+  scoped_refptr<base::FieldTrial> trial =
+      base::FieldTrialList::CreateFieldTrial(
+          "MarkNonSecureAs", security_state::switches::kMarkHttpAsDangerous);
+
+  ASSERT_TRUE(embedded_test_server()->Start());
+
+  // Navigate to a non-local HTTP page.
+  ui_test_utils::NavigateToURL(browser(), GURL("http://example.com/"));
+  WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents();
+  SecurityStateTabHelper* helper = SecurityStateTabHelper::FromWebContents(tab);
+  ASSERT_TRUE(helper);
+
+  security_state::SecurityInfo security_info;
+  helper->GetSecurityInfo(&security_info);
+  EXPECT_EQ(security_state::DANGEROUS, security_info.security_level);
+}
+
+IN_PROC_BROWSER_TEST_F(SSLUITestIgnoringFieldTrialConfig, MarkBlobAsNonSecure) {
   scoped_refptr<base::FieldTrial> trial =
       base::FieldTrialList::CreateFieldTrial(
           "MarkNonSecureAs", security_state::switches::kMarkHttpAsDangerous);