Set translation of toolbar buttons on Url Animations.

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

Index: chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarPhone.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarPhone.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarPhone.java
index 6b1cd17da9b07d795852f2017c32abedcb2b4c94..97bc747662578f0fa54820adc62d9ba10e1d8bb5 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarPhone.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarPhone.java
@@ -903,12 +903,7 @@ public class ToolbarPhone extends ToolbarLayout
                 (mNtpSearchBoxTransformedBounds.top - mPhoneLocationBar.getTop()
                         + halfHeightDifference)));
         if (!mUrlFocusChangeInProgress) {
-            float searchBoxTranslationY =
-                    mNtpSearchBoxTransformedBounds.top - mNtpSearchBoxOriginalBounds.top;
-            searchBoxTranslationY = Math.min(searchBoxTranslationY, 0);
-            mToolbarButtonsContainer.setTranslationY(searchBoxTranslationY);
-            mReturnButton.setTranslationY(searchBoxTranslationY);
-            mHomeButton.setTranslationY(searchBoxTranslationY);
+            setButtonsTranslationY();
         }
 
         mLocationBarBackgroundOffset.set(
@@ -938,6 +933,15 @@ public class ToolbarPhone extends ToolbarLayout
         mForceDrawLocationBarBackground = mUrlExpansionPercent != 0f;
     }
 
+    private void setButtonsTranslationY() {
+        float searchBoxTranslationY =
+                mNtpSearchBoxTransformedBounds.top - mNtpSearchBoxOriginalBounds.top;
+        searchBoxTranslationY = Math.min(searchBoxTranslationY, 0);
+        mToolbarButtonsContainer.setTranslationY(searchBoxTranslationY);
+        mReturnButton.setTranslationY(searchBoxTranslationY);
+        mHomeButton.setTranslationY(searchBoxTranslationY);
+    }
+
     private void setAncestorsShouldClipChildren(boolean clip) {
         if (!isLocationBarShownInNTP()) return;
         ViewGroup parent = this;
@@ -1719,10 +1723,10 @@ public class ToolbarPhone extends ToolbarLayout
         // during the URL focus and defocus animations it should not be touched. Unfortunately
         // updateNtpTransitionAnimation() is called a few times after the URL focus animation has
         // been completed while mUrlFocusChangeInProgress is set to false, causing translationY to
-        // non-zero at the end.
+        // incorrect at the end.
         // We reset the translationY here so the mToolbarButtonsContainer is on screen for the
         // defocusing animation.
-        mToolbarButtonsContainer.setTranslationY(0f);
+        setButtonsTranslationY();
 
         triggerUrlFocusAnimation(hasFocus);