Move SecurityLevel into a class of its own

chrome/browser/ui/android/toolbar/toolbar_model_android.cc

 // Copyright 2014 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/ui/android/toolbar/toolbar_model_android.h"
 
 #include "base/android/jni_string.h"
 #include "base/metrics/field_trial.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/search.h"
@@ skipping 65 matching lines @@
 bool ToolbarModelAndroid::RegisterToolbarModelAndroid(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 // static
 jlong Init(JNIEnv* env, jobject obj, jobject delegate) {
   ToolbarModelAndroid* toolbar_model = new ToolbarModelAndroid(env, delegate);
   return reinterpret_cast<intptr_t>(toolbar_model);
 }
 
-// static
-jint GetSecurityLevelForWebContents(JNIEnv* env,
-                                    jclass jcaller,
-                                    jobject jweb_contents) {
-  content::WebContents* web_contents =
-      content::WebContents::FromJavaWebContents(jweb_contents);
-  DCHECK(web_contents);
-  return ToolbarModelImpl::GetSecurityLevelForWebContents(web_contents);
-}
-
 // Temporary method to allow us to surface a SHA-1 deprecation string on Android
 // in M42. This duplicates a subset of the logic from
 // ToolbarModelImpl::GetSecurityLevelForWebContents() and
 // WebsiteSettings::Init(), which should really be refactored.
 // This is at the wrong layer, and needs to be refactored (along with desktop):
 // https://crbug.com/471390
 
 // static
 jboolean IsDeprecatedSHA1Present(JNIEnv* env,
                                  jclass jcaller,
@@ skipping 14 matching lines @@
     // ToolbarModelImpl::GetSecurityLevelForWebContents().
     static const int64_t kJanuary2016 = INT64_C(13096080000000000);
     if (content::CertStore::GetInstance()->RetrieveCert(ssl.cert_id, &cert) &&
         (ssl.cert_status & net::CERT_STATUS_SHA1_SIGNATURE_PRESENT) &&
         cert->valid_expiry() > base::Time::FromInternalValue(kJanuary2016)) {
       return true;
     }
   }
   return false;
 }