Revert of Move SecurityLevel into a class of its own

chrome/android/java/src/org/chromium/chrome/browser/Tab.java

 // 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.
 
 package org.chromium.chrome.browser;
 
 import android.app.Activity;
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.Color;
@@ skipping 24 matching lines @@
 import org.chromium.chrome.browser.contextmenu.ContextMenuParams;
 import org.chromium.chrome.browser.contextmenu.ContextMenuPopulator;
 import org.chromium.chrome.browser.contextmenu.ContextMenuPopulatorWrapper;
 import org.chromium.chrome.browser.contextmenu.EmptyChromeContextMenuItemDelegate;
 import org.chromium.chrome.browser.fullscreen.FullscreenManager;
 import org.chromium.chrome.browser.infobar.InfoBarContainer;
 import org.chromium.chrome.browser.metrics.UmaSessionStats;
 import org.chromium.chrome.browser.metrics.UmaUtils;
 import org.chromium.chrome.browser.printing.TabPrinter;
 import org.chromium.chrome.browser.profiles.Profile;
-import org.chromium.chrome.browser.ssl.ConnectionSecurityHelper;
-import org.chromium.chrome.browser.ssl.ConnectionSecurityHelperSecurityLevel;
 import org.chromium.chrome.browser.tab.SadTabViewFactory;
 import org.chromium.chrome.browser.tabmodel.TabModel.TabLaunchType;
 import org.chromium.chrome.browser.tabmodel.TabModel.TabSelectionType;
 import org.chromium.chrome.browser.tabmodel.TabModelBase;
 import org.chromium.chrome.browser.tabmodel.TabModelSelector;
+import org.chromium.chrome.browser.toolbar.ToolbarModel;
+import org.chromium.chrome.browser.ui.toolbar.ToolbarModelSecurityLevel;
 import org.chromium.components.navigation_interception.InterceptNavigationDelegate;
 import org.chromium.content.browser.ContentView;
 import org.chromium.content.browser.ContentViewClient;
 import org.chromium.content.browser.ContentViewCore;
 import org.chromium.content_public.browser.InvalidateTypes;
 import org.chromium.content_public.browser.LoadUrlParams;
 import org.chromium.content_public.browser.WebContents;
 import org.chromium.content_public.browser.WebContentsObserver;
 import org.chromium.content_public.common.Referrer;
 import org.chromium.content_public.common.TopControlsState;
@@ skipping 1075 matching lines @@
 
     /**
      * @return Whether or not the {@link ContentViewCore} is using a desktop user agent.
      */
     public boolean getUseDesktopUserAgent() {
         return getWebContents() != null && getWebContents().getNavigationController()
                 .getUseDesktopUserAgent();
     }
 
     /**
-     * @return The current {@link ConnectionSecurityHelperSecurityLevel} for the tab.
+     * @return The current {ToolbarModelSecurityLevel} for the tab.
      */
     // TODO(tedchoc): Remove this and transition all clients to use ToolbarModel directly.
     public int getSecurityLevel() {
-        return ConnectionSecurityHelper.getSecurityLevelForWebContents(getWebContents());
+        return ToolbarModel.getSecurityLevelForWebContents(getWebContents());
     }
 
     /**
      * @return The sync id of the tab if session sync is enabled, {@code 0} otherwise.
      */
     @CalledByNative
     protected int getSyncId() {
         return mSyncId;
     }
 
@@ skipping 1281 matching lines @@
 
     /**
      * @return Whether hiding top controls is enabled or not.
      */
     protected boolean isHidingTopControlsEnabled() {
         String url = getUrl();
         boolean enableHidingTopControls = url != null && !url.startsWith(UrlConstants.CHROME_SCHEME)
                 && !url.startsWith(UrlConstants.CHROME_NATIVE_SCHEME);
 
         int securityState = getSecurityLevel();
-        enableHidingTopControls &=
-                (securityState != ConnectionSecurityHelperSecurityLevel.SECURITY_ERROR
-                        && securityState != ConnectionSecurityHelperSecurityLevel.SECURITY_WARNING);
+        enableHidingTopControls &= (securityState != ToolbarModelSecurityLevel.SECURITY_ERROR
+                && securityState != ToolbarModelSecurityLevel.SECURITY_WARNING);
 
         enableHidingTopControls &=
                 !AccessibilityUtil.isAccessibilityEnabled(getApplicationContext());
         enableHidingTopControls &= !mIsImeShowing;
         enableHidingTopControls &= !mIsShowingErrorPage;
         enableHidingTopControls &= !getWebContents().isShowingInterstitialPage();
 
         return enableHidingTopControls;
     }
 
@@ skipping 309 matching lines @@
     private native void nativeAttachToTabContentManager(long nativeTabAndroid,
             TabContentManager tabContentManager);
     private native void nativeAttachOverlayContentViewCore(long nativeTabAndroid,
             ContentViewCore content, boolean visible);
     private native void nativeDetachOverlayContentViewCore(long nativeTabAndroid,
             ContentViewCore content);
     private native boolean nativeHasPrerenderedUrl(long nativeTabAndroid, String url);
 
     private static native void nativeRecordStartupToCommitUma();
 }