Revert of Refactor connection_security into SecurityStateModel

chrome/browser/ui/toolbar/toolbar_model_unittest.cc

Index: chrome/browser/ui/toolbar/toolbar_model_unittest.cc
diff --git a/chrome/browser/ui/toolbar/toolbar_model_unittest.cc b/chrome/browser/ui/toolbar/toolbar_model_unittest.cc
index 67cb5a20f3977906e2b5940a710c74b47080dfc8..4963fb442a9a8316b42830868c03674d167c1b56 100644
--- a/chrome/browser/ui/toolbar/toolbar_model_unittest.cc
+++ b/chrome/browser/ui/toolbar/toolbar_model_unittest.cc
@@ -11,7 +11,6 @@
 #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"
@@ -132,15 +131,6 @@
     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
 
@@ -215,8 +205,8 @@
   // 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,
@@ -301,15 +291,15 @@
                       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));
 }