Revert of Refactor connection_security into SecurityStateModel

chrome/browser/ui/toolbar/toolbar_model_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/toolbar/toolbar_model.h"
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/search_engines/ui_thread_search_terms_data.h"
-#include "chrome/browser/ssl/security_state_model.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/browser_with_test_window_test.h"
 #include "components/google/core/browser/google_switches.h"
 #include "components/search/search.h"
 #include "components/toolbar/toolbar_model.h"
 #include "components/variations/entropy_provider.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/common/ssl_status.h"
@@ skipping 101 matching lines @@
     GURL("https://google.com/search?q=ftp://tractorsupply.ie&espv=1"),
     base::ASCIIToUTF16(
         "https://google.com/search?q=ftp://tractorsupply.ie&espv=1"),
     base::ASCIIToUTF16("ftp://tractorsupply.ie"),
     base::ASCIIToUTF16("ftp://tractorsupply.ie"),
     true,
     true
   },
 };
 
-void SetSecurityStyle(content::NavigationController* controller,
-                      content::SecurityStyle new_style) {
-  controller->GetVisibleEntry()->GetSSL().security_style = new_style;
-  SecurityStateModel* model =
-      SecurityStateModel::FromWebContents(controller->GetWebContents());
-  ASSERT_TRUE(model);
-  model->SecurityStateChanged();
-}
-
 }  // namespace
 
 
 // ToolbarModelTest -----------------------------------------------------------
 
 class ToolbarModelTest : public BrowserWithTestWindowTest {
  public:
   ToolbarModelTest();
   ToolbarModelTest(Browser::Type browser_type,
                    chrome::HostDesktopType host_desktop_type,
@@ skipping 53 matching lines @@
   EXPECT_EQ(expected_text, toolbar_model->GetText());
   EXPECT_EQ(would_perform_search_term_replacement,
             toolbar_model->WouldPerformSearchTermReplacement(false));
   EXPECT_EQ(should_display_url, toolbar_model->ShouldDisplayURL());
 
   // Check after commit.
   CommitPendingLoad(controller);
   // Fake a secure connection for HTTPS URLs, or the toolbar will refuse to
   // extract search terms.
   if (url.SchemeIsCryptographic()) {
-    ASSERT_NO_FATAL_FAILURE(
-        SetSecurityStyle(controller, content::SECURITY_STYLE_AUTHENTICATED));
+    controller->GetVisibleEntry()->GetSSL().security_style =
+        content::SECURITY_STYLE_AUTHENTICATED;
   }
   EXPECT_EQ(expected_text, toolbar_model->GetText());
   EXPECT_EQ(would_perform_search_term_replacement,
             toolbar_model->WouldPerformSearchTermReplacement(false));
   EXPECT_EQ(should_display_url, toolbar_model->ShouldDisplayURL());
 
   // Now pretend the user started modifying the omnibox.
   toolbar_model->set_input_in_progress(true);
   EXPECT_FALSE(toolbar_model->WouldPerformSearchTermReplacement(false));
   EXPECT_EQ(would_perform_search_term_replacement,
@@ skipping 64 matching lines @@
   search::EnableQueryExtractionForTesting();
   AddTab(browser(), GURL(url::kAboutBlankURL));
 
   // While loading, we should be willing to extract search terms.
   content::NavigationController* controller =
       &browser()->tab_strip_model()->GetWebContentsAt(0)->GetController();
   controller->LoadURL(GURL("https://google.com/search?q=tractor+supply&espv=1"),
                       content::Referrer(), ui::PAGE_TRANSITION_LINK,
                       std::string());
   ToolbarModel* toolbar_model = browser()->toolbar_model();
-  ASSERT_NO_FATAL_FAILURE(
-      SetSecurityStyle(controller, content::SECURITY_STYLE_UNKNOWN));
+  controller->GetVisibleEntry()->GetSSL().security_style =
+      content::SECURITY_STYLE_UNKNOWN;
   EXPECT_TRUE(toolbar_model->WouldPerformSearchTermReplacement(false));
 
   // When done loading, we shouldn't extract search terms if we didn't get an
   // authenticated connection.
   CommitPendingLoad(controller);
-  ASSERT_NO_FATAL_FAILURE(
-      SetSecurityStyle(controller, content::SECURITY_STYLE_UNKNOWN));
+  controller->GetVisibleEntry()->GetSSL().security_style =
+      content::SECURITY_STYLE_UNKNOWN;
   EXPECT_FALSE(toolbar_model->WouldPerformSearchTermReplacement(false));
 }
 
 // When the Google base URL is overridden on the command line, we should extract
 // search terms from URLs that start with that base URL even when they're not
 // secure.
 TEST_F(ToolbarModelTest, GoogleBaseURL) {
   search::EnableQueryExtractionForTesting();
   AddTab(browser(), GURL(url::kAboutBlankURL));
 
@@ skipping 42 matching lines @@
 
   // Disabling URL replacement should reset to only showing URLs.
   browser()->toolbar_model()->set_url_replacement_enabled(false);
   for (size_t i = 0; i < arraysize(test_items); ++i) {
     const TestItem& test_item = test_items[i];
     NavigateAndCheckText(test_item.url,
                          test_item.expected_text_url_replacement_inactive,
                          false, test_item.should_display_url);
   }
 }