Reland: Check for url changes to flip state for showing title only

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

Index: chrome/android/java/src/org/chromium/chrome/browser/toolbar/CustomTabToolbar.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/CustomTabToolbar.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/CustomTabToolbar.java
index 72b3b4e2320ebdc8540550ca395f17b624625d58..391b0cae5ddd7b50c94ce1701e0e26bf1442bcb1 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/CustomTabToolbar.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/CustomTabToolbar.java
@@ -73,7 +73,7 @@ public class CustomTabToolbar extends ToolbarLayout implements LocationBar,
     private boolean mBackgroundColorSet;
     private long mInitializeTimeStamp;
     private int mState = STATE_DOMAIN_ONLY;
-    private boolean mIsFirstLoad = true;
+    private String mFirstUrl;
 
     private Runnable mTitleAnimationStarter = new Runnable() {
         @Override
@@ -275,10 +275,13 @@ public class CustomTabToolbar extends ToolbarLayout implements LocationBar,
     protected void onNavigatedToDifferentPage() {
         super.onNavigatedToDifferentPage();
         setTitleToPageTitle();
-        if (mIsFirstLoad) {
-            mIsFirstLoad = false;
-        } else if (mState == STATE_TITLE_ONLY) {
-            setUrlBarHidden(false);
+        if (mState == STATE_TITLE_ONLY) {
+            if (TextUtils.isEmpty(mFirstUrl)) {
+                mFirstUrl = getToolbarDataProvider().getTab().getUrl();
+            } else {
+                if (mFirstUrl.equals(getToolbarDataProvider().getTab().getUrl())) return;
+                setUrlBarHidden(false);
+            }
         }
     }