Revert of Refactor connection_security into SecurityStateModel

chrome/browser/android/chrome_web_contents_delegate_android.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 "chrome/browser/android/chrome_web_contents_delegate_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/command_line.h"
 #include "chrome/browser/android/feature_utilities.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/file_select_helper.h"
 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
 #include "chrome/browser/media/media_stream_capture_indicator.h"
 #include "chrome/browser/media/protected_media_identifier_permission_context.h"
 #include "chrome/browser/media/protected_media_identifier_permission_context_factory.h"
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/browser/prerender/prerender_manager_factory.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ssl/security_state_model.h"
 #include "chrome/browser/ui/android/bluetooth_chooser_android.h"
 #include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/find_bar/find_notification_details.h"
 #include "chrome/browser/ui/find_bar/find_tab_helper.h"
 #include "chrome/browser/ui/tab_helpers.h"
 #include "chrome/common/chrome_switches.h"
 #include "components/app_modal/javascript_dialog_manager.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
@@ skipping 77 matching lines @@
 
 scoped_ptr<BluetoothChooser>
 ChromeWebContentsDelegateAndroid::RunBluetoothChooser(
     content::WebContents* web_contents,
     const BluetoothChooser::EventHandler& event_handler,
     const GURL& origin) {
   return make_scoped_ptr(
       new BluetoothChooserAndroid(web_contents, event_handler, origin));
 }
 
-void ChromeWebContentsDelegateAndroid::VisibleSSLStateChanged(
-    content::WebContents* web_contents) {
-  DCHECK(web_contents);
-  // Notify the model that the security state has changed, so that the
-  // URL bar updates with up-to-date data computed by the model.
-  SecurityStateModel* model = SecurityStateModel::FromWebContents(web_contents);
-  DCHECK(model);
-  model->SecurityStateChanged();
-  WebContentsDelegateAndroid::VisibleSSLStateChanged(web_contents);
-}
-
 void ChromeWebContentsDelegateAndroid::CloseContents(
     WebContents* web_contents) {
   // Prevent dangling registrations assigned to closed web contents.
   if (notification_registrar_.IsRegistered(this,
       chrome::NOTIFICATION_FIND_RESULT_AVAILABLE,
       content::Source<WebContents>(web_contents))) {
     notification_registrar_.Remove(this,
         chrome::NOTIFICATION_FIND_RESULT_AVAILABLE,
         content::Source<WebContents>(web_contents));
   }
@@ skipping 273 matching lines @@
 jboolean IsCapturingVideo(JNIEnv* env,
                           const JavaParamRef<jclass>& clazz,
                           const JavaParamRef<jobject>& java_web_contents) {
   content::WebContents* web_contents =
       content::WebContents::FromJavaWebContents(java_web_contents);
   scoped_refptr<MediaStreamCaptureIndicator> indicator =
       MediaCaptureDevicesDispatcher::GetInstance()->
           GetMediaStreamCaptureIndicator();
   return indicator->IsCapturingVideo(web_contents);
 }