weblayer: update version for restore and BrowserControlsOffsetCallback

BrowserControlsOffsetCallback landed in 88, not 87.

I merged the restore code to 87:
https://chromium-review.googlesource.com/c/chromium/src/+/2454639
so the version checks need to be updated.

Lastly, I named a method wrong in Browser. This fixed that.

BUG=none
TEST=this only updates comments.

Change-Id: I073dc8986588853c27aed906ed0f5ccee71f923c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2454837Reviewed-by: Clark DuVall <cduvall@chromium.org>
Commit-Queue: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#814797}

weblayer/browser/java/org/chromium/weblayer_private/BrowserImpl.java

@@ -501,7 +501,7 @@ public class BrowserImpl extends IBrowser.Stub implements View.OnAttachStateChan
 
     @CalledByNative
     private void onRestoreCompleted() throws RemoteException {
-        mClient.onRestoreCompleted();
+        if (WebLayerFactoryImpl.getClientMajorVersion() >= 87) mClient.onRestoreCompleted();
     }
 
     public View getFragmentView() {

weblayer/browser/java/org/chromium/weblayer_private/interfaces/IBrowser.aidl

@@ -42,8 +42,8 @@ interface IBrowser {
                                       in boolean animate) = 12;
 
   // Added in 87.
-  void setBrowserControlsOffsetsEnabled(in boolean enable) = 13;
+  boolean isRestoringPreviousState() = 14;
 
   // Added in 88.
-  boolean isRestoringPreviousState() = 14;
+  void setBrowserControlsOffsetsEnabled(in boolean enable) = 13;
 }

weblayer/browser/java/org/chromium/weblayer_private/interfaces/IBrowserClient.aidl

@@ -14,9 +14,9 @@ interface IBrowserClient {
 
   // Added in 87.
   IRemoteFragment createMediaRouteDialogFragment() = 3;
-  void onBrowserControlsOffsetsChanged(in boolean isTop,
-                                       in int controlsOffset) = 4;
+  void onRestoreCompleted() = 5;
 
   // Added in 88.
-  void onRestoreCompleted() = 5;
+  void onBrowserControlsOffsetsChanged(in boolean isTop,
+                                       in int controlsOffset) = 4;
 }

weblayer/public/java/org/chromium/weblayer/Browser.java

@@ -228,11 +228,11 @@ public class Browser {
      *
      * @param True if restoring previous state.
      *
-     * @since 88
+     * @since 87
      */
     public boolean isRestoringPreviousState() {
         ThreadCheck.ensureOnUiThread();
-        if (WebLayer.getSupportedMajorVersionInternal() < 88) {
+        if (WebLayer.getSupportedMajorVersionInternal() < 87) {
             throw new UnsupportedOperationException();
         }
         throwIfDestroyed();
@@ -248,11 +248,11 @@ public class Browser {
      *
      * @param callback The BrowserRestoreCallback.
      *
-     * @since 88
+     * @since 87
      */
     public void registerBrowserRestoreCallback(@NonNull BrowserRestoreCallback callback) {
         ThreadCheck.ensureOnUiThread();
-        if (WebLayer.getSupportedMajorVersionInternal() < 88) {
+        if (WebLayer.getSupportedMajorVersionInternal() < 87) {
             throw new UnsupportedOperationException();
         }
         throwIfDestroyed();
@@ -264,11 +264,11 @@ public class Browser {
      *
      * @param callback The BrowserRestoreCallback.
      *
-     * @since 88
+     * @since 87
      */
     public void unregisterBrowserRestoreCallback(@NonNull BrowserRestoreCallback callback) {
         ThreadCheck.ensureOnUiThread();
-        if (WebLayer.getSupportedMajorVersionInternal() < 88) {
+        if (WebLayer.getSupportedMajorVersionInternal() < 87) {
             throw new UnsupportedOperationException();
         }
         throwIfDestroyed();
@@ -346,13 +346,13 @@ public class Browser {
      *
      * @param callback The BrowserControlsOffsetCallback to notify
      *
-     * @since 87
+     * @since 88
      */
     public void registerBrowserControlsOffsetCallback(
             @NonNull BrowserControlsOffsetCallback callback) {
         ThreadCheck.ensureOnUiThread();
         throwIfDestroyed();
-        if (WebLayer.getSupportedMajorVersionInternal() < 87) {
+        if (WebLayer.getSupportedMajorVersionInternal() < 88) {
             throw new UnsupportedOperationException();
         }
         if (mBrowserControlsOffsetCallbacks.isEmpty()) {
@@ -371,12 +371,13 @@ public class Browser {
      *
      * @param callback The BrowserControlsOffsetCallback to remove.
      *
-     * @since 87
+     * @since 88
      */
-    public void unregisterScrollOffsetCallback(@NonNull BrowserControlsOffsetCallback callback) {
+    public void unregisterBrowserControlsOffsetCallback(
+            @NonNull BrowserControlsOffsetCallback callback) {
         ThreadCheck.ensureOnUiThread();
         throwIfDestroyed();
-        if (WebLayer.getSupportedMajorVersionInternal() < 87) {
+        if (WebLayer.getSupportedMajorVersionInternal() < 88) {
             throw new UnsupportedOperationException();
         }
         mBrowserControlsOffsetCallbacks.removeObserver(callback);

weblayer/public/java/org/chromium/weblayer/BrowserControlsOffsetCallback.java

@@ -13,7 +13,7 @@ package org.chromium.weblayer;
  * scroll, than an empty View should be set as the top/bottom control and the real View should be
  * positioned based on the offsets supplied to the callback.
  *
- * @since 87
+ * @since 88
  */
 public abstract class BrowserControlsOffsetCallback {
     /**