Ensure Omnibox suggestion measure width matches layout width.

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.omnibox;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.res.TypedArray;
@@ skipping 803 matching lines @@
                 mUrlBar = (UrlBar) locationBarView.findViewById(R.id.url_bar);
                 mUrlBar.addOnLayoutChangeListener(this);
             }
             if (mNavigationButton == null) {
                 mNavigationButton =
                         (ImageView) locationBarView.findViewById(R.id.navigation_button);
                 mNavigationButton.addOnLayoutChangeListener(this);
             }
 
             // Align the text to be pixel perfectly aligned with the text in the url bar.
-            mTextLeft = getSuggestionTextLeftPosition();
-            mTextRight = getSuggestionTextRightPosition();
             boolean isRTL = ApiCompatibilityUtils.isLayoutRtl(this);
             if (DeviceFormFactor.isTablet(getContext())) {
                 int textWidth = isRTL ? mTextRight : (r - l - mTextLeft);
                 final float maxRequiredWidth = mSuggestionDelegate.getMaxRequiredWidth();
                 final float maxMatchContentsWidth = mSuggestionDelegate.getMaxMatchContentsWidth();
                 float paddingStart = (textWidth > maxRequiredWidth)
                         ? (mRequiredWidth - mMatchContentsWidth)
                         : Math.max(textWidth - maxMatchContentsWidth, 0);
                 ApiCompatibilityUtils.setPaddingRelative(
                         mTextLine1, (int) paddingStart, mTextLine1.getPaddingTop(),
@@ skipping 75 matching lines @@
             getLocationOnScreen(mViewPositionHolder);
 
             return navButtonXPosition - mViewPositionHolder[0];
         }
 
         @Override
         protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
             int width = MeasureSpec.getSize(widthMeasureSpec);
             int height = MeasureSpec.getSize(heightMeasureSpec);
 
+            boolean isRTL = ApiCompatibilityUtils.isLayoutRtl(this);
+            mTextLeft = getSuggestionTextLeftPosition();
+            mTextRight = getSuggestionTextRightPosition();
+
+            int maxWidth = width - (isRTL ? mTextRight : mTextLeft);
             if (mTextLine1.getMeasuredWidth() != width
                     || mTextLine1.getMeasuredHeight() != height) {
-                mTextLine1.measure(
-                        MeasureSpec.makeMeasureSpec(widthMeasureSpec, MeasureSpec.AT_MOST),
+                mTextLine1.measure(MeasureSpec.makeMeasureSpec(maxWidth, MeasureSpec.AT_MOST),
                         MeasureSpec.makeMeasureSpec(mSuggestionHeight, MeasureSpec.AT_MOST));
             }
 
             if (mTextLine2.getMeasuredWidth() != width
                     || mTextLine2.getMeasuredHeight() != height) {
-                mTextLine2.measure(
-                        MeasureSpec.makeMeasureSpec(widthMeasureSpec, MeasureSpec.AT_MOST),
+                mTextLine2.measure(MeasureSpec.makeMeasureSpec(maxWidth, MeasureSpec.AT_MOST),
                         MeasureSpec.makeMeasureSpec(mSuggestionHeight, MeasureSpec.AT_MOST));
             }
             if (MeasureSpec.getMode(heightMeasureSpec) == MeasureSpec.AT_MOST) {
                 int desiredHeight = mTextLine1.getMeasuredHeight() + mTextLine2.getMeasuredHeight();
                 int additionalPadding = (int) getResources().getDimension(
                         R.dimen.omnibox_suggestion_text_vertical_padding);
                 if (mSuggestion.hasAnswer()) {
                     additionalPadding += (int) getResources().getDimension(
                             R.dimen.omnibox_suggestion_multiline_text_vertical_padding);
                 }
@@ skipping 118 matching lines @@
             if (mUrlBar != null) mUrlBar.removeOnLayoutChangeListener(this);
             if (mLocationBar != null) {
                 mLocationBar.getContainerView().removeOnLayoutChangeListener(this);
             }
             getRootView().removeOnLayoutChangeListener(this);
 
             super.onDetachedFromWindow();
         }
     }
 }