[Tablet] Move conditional showing of the status icon to LocationBarPhone

Bug: 987905
Change-Id: Id5e8e366cabba5cea56725ff459de0f49c19c4ac
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1728267Reviewed-by: Theresa  <twellington@chromium.org>
Commit-Queue: Brandon Wylie <wylieb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#683781}

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

@@ -1000,8 +1000,6 @@ public class LocationBarLayout extends FrameLayout
                 mShouldShowSearchEngineLogo, mIsSearchEngineGoogle, mSearchEngineUrl);
         mToolbarDataProvider.updateSearchEngineStatusIcon(
                 mShouldShowSearchEngineLogo, mIsSearchEngineGoogle, mSearchEngineUrl);
-
-        mStatusViewCoordinator.setShowIconsWhenUrlFocused(shouldShowSearchEngineLogo);
     }
 
     @Override

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

@@ -65,6 +65,7 @@ public class LocationBarPhone extends LocationBarLayout {
         if (mShouldShowSearchEngineLogo) {
             mFirstVisibleFocusedView = findViewById(R.id.location_bar_status);
         }
+        mStatusViewCoordinator.setShowIconsWhenUrlFocused(shouldShowSearchEngineLogo);
     }
 
     /**

chrome/android/java/src/org/chromium/chrome/browser/omnibox/status/StatusMediator.java

@@ -296,6 +296,7 @@ class StatusMediator {
 
         mIsSearchEngineGoogle = isSearchEngineGoogle;
         mShouldShowSearchEngineLogo = shouldShowSearchEngineLogo;
+        updateLocationBarIcon();
     }
 
     /**