Reland "[ToolbarMVC] Observe incognito state changes in location bar."

This reverts commit ee00d9b5.

Reason for revert:
Change was reverted only due to a dependency of a breaking change.

Original change's description:
> Revert "[ToolbarMVC] Observe incognito state changes in location bar."
>
> This reverts commit 7c26f582.
>
> Reason for revert: this CL depends depends on https://crrev.com/c/2495969 that has to be reverted due to test
> failures and crashes (https://crbug.com/1149348, https://crbug.com/1149382). Please contact bsazonov@chromium.org or
> pnoland@chromium.org if you have any questions.
>
> Original change's description:
> > [ToolbarMVC] Observe incognito state changes in location bar.
> >
> > This lets us remove LocationBar#updateMicButtonState() which was
> > a "poke" method on the interface.
> >
> > Do not submit before M88 branch point (Nov 12th)
> >
> > Bug: 1142883
> > Change-Id: If7564ac95e6ca69e28e6de7a609f0db9fa916c9e
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2518202
> > Commit-Queue: bttk <bttk@chromium.org>
> > Reviewed-by: Patrick Noland <pnoland@chromium.org>
> > Reviewed-by: Filip Gorski <fgorski@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#827544}
>
> TBR=fgorski@chromium.org,pnoland@chromium.org,bttk@chromium.org
>
> # Not skipping CQ checks because original CL landed > 1 day ago.
>
> Bug: 1142883, 11493484, 1149382
> Change-Id: Ia30a5089a20687be350892b75411eec2a27f7691
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2540528
> Reviewed-by: Boris Sazonov <bsazonov@chromium.org>
> Reviewed-by: bttk <bttk@chromium.org>
> Reviewed-by: Filip Gorski <fgorski@chromium.org>
> Commit-Queue: Patrick Noland <pnoland@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#827847}

TBR=fgorski@chromium.org,pnoland@chromium.org,bsazonov@chromium.org,bttk@chromium.org

# Not skipping CQ checks because this is a reland.

Bug: 1142883
Bug: 11493484
Bug: 1149382
Change-Id: I6c1e2b617e911747d768a89db7f4208383aa2412
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2541573
Commit-Queue: bttk <bttk@chromium.org>
Reviewed-by: Filip Gorski <fgorski@chromium.org>
Reviewed-by: bttk <bttk@chromium.org>
Reviewed-by: Patrick Noland <pnoland@chromium.org>
Reviewed-by: Boris Sazonov <bsazonov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#827915}

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

@@ -750,6 +750,9 @@ public class CustomTabToolbar extends ToolbarLayout implements View.OnLongClickL
                     UrlBar.ScrollType.SCROLL_TO_TLD, SelectionState.SELECT_ALL);
         }
 
+        @Override
+        public void onIncognitoStateChanged() {}
+
         @Override
         public void updateLoadingState(boolean updateUrl) {
             if (updateUrl) onUrlChanged();
@@ -836,9 +839,6 @@ public class CustomTabToolbar extends ToolbarLayout implements View.OnLongClickL
         @Override
         public void revertChanges() {}
 
-        @Override
-        public void updateMicButtonState() {}
-
         @Nullable
         @Override
         public FakeboxDelegate getFakeboxDelegate() {

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

@@ -76,15 +76,12 @@ public interface LocationBar extends Destroyable {
      */
     View getSecurityIconView();
 
-    /** Updates the state of the mic button if there is one. */
-    void updateMicButtonState();
 
     /** Returns the {@link VoiceRecognitionHandler} associated with this LocationBar. */
     @Nullable
     default VoiceRecognitionHandler getVoiceRecognitionHandler() {
         return null;
     }
-
     /**
      * Returns a (@link FakeboxDelegate}.
      *

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

@@ -187,11 +187,6 @@ public final class LocationBarCoordinator implements LocationBar, FakeboxDelegat
         return mLocationBarLayout.getSecurityIconView();
     }
 
-    @Override
-    public void updateMicButtonState() {
-        mLocationBarLayout.updateMicButtonState();
-    }
-
     @Nullable
     @Override
     public View getViewForUrlBackFocus() {
@@ -262,6 +257,11 @@ public final class LocationBarCoordinator implements LocationBar, FakeboxDelegat
         mLocationBarLayout.setUrl(mLocationbarDataProvider.getCurrentUrl());
     }
 
+    @Override
+    public void onIncognitoStateChanged() {
+        mLocationBarLayout.updateMicButtonState();
+    }
+
     /**
      * Returns the {@link LocationBarCoordinatorPhone} for this coordinator.
      *

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

@@ -31,9 +31,10 @@ public interface LocationBarDataProvider {
      */
     interface Observer {
         void onTitleChanged();
+        void onUrlChanged();
+        void onIncognitoStateChanged();
         // TODO(https://crbug.com/1139481): Add methods for other LocationBarDataProvider
         // data, e.g. NTP and security state.
-        void onUrlChanged();
     }
 
     /** Adds an observer of changes to LocationBarDataProvider's data. */

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

@@ -106,6 +106,7 @@ public class LocationBarModel implements ToolbarDataProvider, LocationBarDataPro
 
     /**
      * Sets the tab that contains the information to be displayed in the toolbar.
+     *
      * @param tab The tab associated currently with the toolbar.
      * @param isIncognito Whether the incognito model is currently selected, which must match the
      *                    passed in tab if non-null.
@@ -113,7 +114,10 @@ public class LocationBarModel implements ToolbarDataProvider, LocationBarDataPro
     public void setTab(Tab tab, boolean isIncognito) {
         assert tab == null || tab.isIncognito() == isIncognito;
         mTab = tab;
-        mIsIncognito = isIncognito;
+        if (mIsIncognito != isIncognito) {
+            mIsIncognito = isIncognito;
+            notifyIncognitoStateChanged();
+        }
         updateUsingBrandColor();
         notifyTitleChanged();
         notifyUrlChanged();
@@ -285,6 +289,12 @@ public class LocationBarModel implements ToolbarDataProvider, LocationBarDataPro
         return mIsIncognito;
     }
 
+    private void notifyIncognitoStateChanged() {
+        for (LocationBarDataProvider.Observer observer : mLocationBarDataObservers) {
+            observer.onIncognitoStateChanged();
+        }
+    }
+
     /**
      * @return Whether the location bar is showing in overview mode. If the location bar should not
      *  currently be showing in overview mode, returns false.

chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarLayout.java

@@ -525,7 +525,6 @@ public abstract class ToolbarLayout
      */
     void onTabOrModelChanged() {
         mTabOrModelChangeRunnable.run();
-        getLocationBar().updateMicButtonState();
     }
 
     /**

chrome/android/javatests/src/org/chromium/chrome/browser/toolbar/LocationBarModelTest.java

@@ -4,6 +4,12 @@
 
 package org.chromium.chrome.browser.toolbar;
 
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
 import android.support.test.InstrumentationRegistry;
 
 import androidx.test.filters.MediumTest;
@@ -16,25 +22,34 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import org.chromium.base.ContextUtils;
+import org.chromium.base.test.params.ParameterAnnotations;
+import org.chromium.base.test.params.ParameterProvider;
+import org.chromium.base.test.params.ParameterSet;
+import org.chromium.base.test.params.ParameterizedRunner;
 import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.base.test.util.Feature;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeTabbedActivity;
 import org.chromium.chrome.browser.flags.ChromeSwitches;
+import org.chromium.chrome.browser.omnibox.LocationBarDataProvider;
 import org.chromium.chrome.browser.omnibox.UrlBarData;
 import org.chromium.chrome.browser.tab.MockTab;
 import org.chromium.chrome.browser.tab.Tab;
+import org.chromium.chrome.browser.tab.TabSelectionType;
 import org.chromium.chrome.browser.toolbar.top.ToolbarLayout;
-import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
 import org.chromium.chrome.test.ChromeTabbedActivityTestRule;
 import org.chromium.chrome.test.util.ChromeTabUtils;
 import org.chromium.components.embedder_support.util.UrlConstants;
 import org.chromium.content_public.browser.test.util.TestThreadUtils;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
 /**
  * Tests for LocationBarModel.
  */
-@RunWith(ChromeJUnit4ClassRunner.class)
+@RunWith(ParameterizedRunner.class)
 @CommandLineFlags.Add({ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE})
 public class LocationBarModelTest {
     @Rule
@@ -57,9 +72,9 @@ public class LocationBarModelTest {
                 getCurrentTabId(mActivityTestRule.getActivity()));
         ChromeTabUtils.closeCurrentTab(
                 InstrumentationRegistry.getInstrumentation(), mActivityTestRule.getActivity());
-        Assert.assertEquals("Didn't close all tabs.", 0,
+        assertEquals("Didn't close all tabs.", 0,
                 ChromeTabUtils.getNumOpenTabs(mActivityTestRule.getActivity()));
-        Assert.assertEquals("LocationBarModel is still trying to show a tab.", Tab.INVALID_TAB_ID,
+        assertEquals("LocationBarModel is still trying to show a tab.", Tab.INVALID_TAB_ID,
                 getCurrentTabId(mActivityTestRule.getActivity()));
     }
 
@@ -88,13 +103,107 @@ public class LocationBarModelTest {
         });
     }
 
+    /** Provides parameters for different types of transitions between tabs. */
+    public static class IncognitoTransitionParamProvider implements ParameterProvider {
+        @Override
+        public Iterable<ParameterSet> getParameters() {
+            List<ParameterSet> result = new ArrayList<>(8);
+            for (boolean fromIncognito : Arrays.asList(true, false)) {
+                for (boolean toIncognito : Arrays.asList(true, false)) {
+                    result.add(new ParameterSet()
+                                       .value(fromIncognito, toIncognito)
+                                       .name(String.format(
+                                               "from_%b_to_%b", fromIncognito, toIncognito)));
+                }
+            }
+            return result;
+        }
+    }
+
+    @Test
+    @MediumTest
+    @ParameterAnnotations.UseMethodParameter(IncognitoTransitionParamProvider.class)
+    public void testOnIncognitoStateChange_switchTab(boolean fromIncognito, boolean toIncognito) {
+        // Add a regular tab next to the one created in setup.
+        mActivityTestRule.loadUrlInNewTab("about:blank", /*incognito=*/false);
+        // Add two incognito tabs.
+        mActivityTestRule.loadUrlInNewTab("about:blank", /*incognito=*/true);
+        mActivityTestRule.loadUrlInNewTab("about:blank", /*incognito=*/true);
+
+        ChromeTabbedActivity activity = mActivityTestRule.getActivity();
+        LocationBarModel locationBarModel =
+                activity.getToolbarManager().getLocationBarModelForTesting();
+        LocationBarDataProvider.Observer observer = mock(LocationBarDataProvider.Observer.class);
+        doAnswer((invocation) -> {
+            assertEquals(toIncognito, locationBarModel.isIncognito());
+            return null;
+        })
+                .when(observer)
+                .onIncognitoStateChanged();
+
+        TestThreadUtils.runOnUiThreadBlocking(() -> {
+            mActivityTestRule.getActivity().getTabModelSelector().selectModel(fromIncognito);
+            locationBarModel.addObserver(observer);
+
+            // Switch to an existing tab.
+            mActivityTestRule.getActivity().getTabModelSelector().selectModel(/*incognito=*/
+                    toIncognito);
+            mActivityTestRule.getActivity().getTabModelSelector().getCurrentModel().setIndex(
+                    0, TabSelectionType.FROM_USER);
+        });
+
+        assertEquals(toIncognito, locationBarModel.isIncognito());
+        if (fromIncognito != toIncognito) {
+            verify(observer).onIncognitoStateChanged();
+        } else {
+            verify(observer, times(0)).onIncognitoStateChanged();
+        }
+    }
+
+    @Test
+    @MediumTest
+    @ParameterAnnotations.UseMethodParameter(IncognitoTransitionParamProvider.class)
+    public void testOnIncognitoStateChange_newTab(boolean fromIncognito, boolean toIncognito) {
+        // Add a regular tab next to the one created in setup.
+        mActivityTestRule.loadUrlInNewTab("about:blank", /*incognito=*/false);
+        // Add two incognito tabs.
+        mActivityTestRule.loadUrlInNewTab("about:blank", /*incognito=*/true);
+        mActivityTestRule.loadUrlInNewTab("about:blank", /*incognito=*/true);
+
+        ChromeTabbedActivity activity = mActivityTestRule.getActivity();
+        LocationBarModel locationBarModel =
+                activity.getToolbarManager().getLocationBarModelForTesting();
+        LocationBarDataProvider.Observer observer = mock(LocationBarDataProvider.Observer.class);
+        doAnswer((invocation) -> {
+            assertEquals(toIncognito, locationBarModel.isIncognito());
+            return null;
+        })
+                .when(observer)
+                .onIncognitoStateChanged();
+
+        TestThreadUtils.runOnUiThreadBlocking(() -> {
+            mActivityTestRule.getActivity().getTabModelSelector().selectModel(fromIncognito);
+            locationBarModel.addObserver(observer);
+        });
+
+        // Switch to a new tab.
+        mActivityTestRule.loadUrlInNewTab("about:blank", toIncognito);
+
+        assertEquals(toIncognito, locationBarModel.isIncognito());
+        if (fromIncognito != toIncognito) {
+            verify(observer).onIncognitoStateChanged();
+        } else {
+            verify(observer, times(0)).onIncognitoStateChanged();
+        }
+    }
+
     private void assertDisplayAndEditText(
             ToolbarDataProvider dataProvider, String displayText, String editText) {
         TestThreadUtils.runOnUiThreadBlocking(() -> {
             UrlBarData urlBarData = dataProvider.getUrlBarData();
-            Assert.assertEquals(
+            assertEquals(
                     "Display text did not match", displayText, urlBarData.displayText.toString());
-            Assert.assertEquals("Editing text did not match", editText, urlBarData.editingText);
+            assertEquals("Editing text did not match", editText, urlBarData.editingText);
         });
     }