Revert of [Contextual Search] Improve testing & add regressions tests

chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelContent.java

Index: chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelContent.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelContent.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelContent.java
index 88cdcb5a324e97f36da82f6a3547dfaac2cd126c..3d74cb934588cbd29a339a7ba551c25aa2a8e1b3 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelContent.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelContent.java
@@ -156,15 +156,6 @@
     // ============================================================================================
 
     /**
-     * Creates a ContentViewCore. This method will be overridden by tests.
-     * @param activity The ChromeActivity.
-     * @return The newly created ContentViewCore.
-     */
-    protected ContentViewCore createContentViewCore(ChromeActivity activity) {
-        return new ContentViewCore(activity);
-    }
-
-    /**
      * Create a new ContentViewCore that will be managed by this panel.
      */
     private void createNewContentView() {
@@ -176,7 +167,7 @@
             destroyContentView();
         }
 
-        mContentViewCore = createContentViewCore(mActivity);
+        mContentViewCore = new ContentViewCore(mActivity);
 
         if (mContentViewClient == null) {
             mContentViewClient = new ContentViewClient();
@@ -254,6 +245,14 @@
             // After everything has been disposed, notify the observer.
             mContentDelegate.onContentViewDestroyed();
         }
+    }
+
+    /**
+     * @return Whether the ContentViewCore was created.
+     */
+    @VisibleForTesting
+    public boolean didCreateContentView() {
+        return mContentViewCore != null;
     }
 
     /**