Remove ToolbarManager#getToolbarView

Bug: 865801
Change-Id: I8025699a43df94a67991799983f03f0f242d7d55
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2212996Reviewed-by: Patrick Noland <pnoland@chromium.org>
Reviewed-by: Michael Thiessen <mthiesse@chromium.org>
Commit-Queue: Michael Thiessen <mthiesse@chromium.org>
Auto-Submit: who/bttk <bttk@chromium.org>
Cr-Commit-Position: refs/heads/master@{#771899}

chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java

@@ -1276,14 +1276,6 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
         if (toolbarShadow != null) toolbarShadow.setVisibility(visibility);
     }
 
-    /**
-     * Gets the Toolbar view.
-     */
-    @Nullable
-    public View getToolbarView() {
-        return mControlContainer.findViewById(R.id.toolbar);
-    }
-
     /**
      * We use getTopControlOffset to position the top controls. However, the toolbar's height may
      * be less than the total top controls height. If that's the case, this method will return the

chrome/android/javatests/src/org/chromium/chrome/browser/TabsTest.java

@@ -1592,7 +1592,8 @@ public class TabsTest {
     private void performToolbarSideSwipe(@ScrollDirection int direction) {
         Assert.assertTrue("Unexpected direction for side swipe " + direction,
                 direction == ScrollDirection.LEFT || direction == ScrollDirection.RIGHT);
-        final View toolbar = mActivityTestRule.getActivity().getToolbarManager().getToolbarView();
+        final View toolbar = mActivityTestRule.getActivity().findViewById(R.id.toolbar);
+
         int[] toolbarPos = new int[2];
         toolbar.getLocationOnScreen(toolbarPos);
         final int width = toolbar.getWidth();