Fix LocationBarLayout#getUrlContainerMarginEnd

BUG=897592,814528

Change-Id: I2c9adf2ff533446c10be19d12ec3c83a8b1e0323
Reviewed-on: https://chromium-review.googlesource.com/c/1294131Reviewed-by: Matthew Jones <mdjones@chromium.org>
Commit-Queue: Theresa <twellington@chromium.org>
Cr-Commit-Position: refs/heads/master@{#601637}

chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarLayout.java

@@ -602,17 +602,13 @@ public class LocationBarLayout extends FrameLayout
      */
     @Override
     public int getUrlContainerMarginEnd() {
-        boolean addMarginForActionsContainer = !mUrlFocusChangeInProgress || isUrlBarFocused();
-
         int urlContainerMarginEnd = 0;
-        if (addMarginForActionsContainer) {
-            for (View childView : getUrlContainerViewsForMargin()) {
-                ViewGroup.MarginLayoutParams childLayoutParams =
-                        (ViewGroup.MarginLayoutParams) childView.getLayoutParams();
-                urlContainerMarginEnd += childLayoutParams.width
-                        + MarginLayoutParamsCompat.getMarginStart(childLayoutParams)
-                        + MarginLayoutParamsCompat.getMarginEnd(childLayoutParams);
-            }
+        for (View childView : getUrlContainerViewsForMargin()) {
+            ViewGroup.MarginLayoutParams childLayoutParams =
+                    (ViewGroup.MarginLayoutParams) childView.getLayoutParams();
+            urlContainerMarginEnd += childLayoutParams.width
+                    + MarginLayoutParamsCompat.getMarginStart(childLayoutParams)
+                    + MarginLayoutParamsCompat.getMarginEnd(childLayoutParams);
         }
         return urlContainerMarginEnd;
     }