Photo Picker dialog: Make toolbar behave more like mocks.

chrome/android/java/src/org/chromium/chrome/browser/widget/selection/SelectableListToolbar.java

Index: chrome/android/java/src/org/chromium/chrome/browser/widget/selection/SelectableListToolbar.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/widget/selection/SelectableListToolbar.java b/chrome/android/java/src/org/chromium/chrome/browser/widget/selection/SelectableListToolbar.java
index 0ef88875a5e8dd210878417c92c2f4e25cc3af96..ecf5e826eb115179888e451163737bd1ca8158c6 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/widget/selection/SelectableListToolbar.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/widget/selection/SelectableListToolbar.java
@@ -551,7 +551,7 @@ public class SelectableListToolbar<E> extends Toolbar implements SelectionObserv
         updateDisplayStyleIfNecessary();
     }
 
-    private void showSelectionView(List<E> selectedItems, boolean wasSelectionEnabled) {
+    protected void showSelectionView(List<E> selectedItems, boolean wasSelectionEnabled) {
         getMenu().setGroupVisible(mNormalGroupResId, false);
         getMenu().setGroupVisible(mSelectedGroupResId, true);
         if (mHasSearchView) mSearchView.setVisibility(View.GONE);
@@ -559,11 +559,8 @@ public class SelectableListToolbar<E> extends Toolbar implements SelectionObserv
         setNavigationButton(NAVIGATION_BUTTON_SELECTION_BACK);
         setBackgroundColor(mSelectionBackgroundColor);
         setOverflowIcon(mSelectionMenuButton);
-        setTitle(null);
 
-        mNumberRollView.setVisibility(View.VISIBLE);
-        if (!wasSelectionEnabled) mNumberRollView.setNumber(0, false);
-        mNumberRollView.setNumber(selectedItems.size(), true);
+        switchToNumberRollView(selectedItems, wasSelectionEnabled);
 
         if (mIsSearching) UiUtils.hideKeyboard(mSearchEditText);
 
@@ -583,6 +580,13 @@ public class SelectableListToolbar<E> extends Toolbar implements SelectionObserv
         updateDisplayStyleIfNecessary();
     }
 
+    protected void switchToNumberRollView(List<E> selectedItems, boolean wasSelectionEnabled) {
+        setTitle(null);
+        mNumberRollView.setVisibility(View.VISIBLE);
+        if (!wasSelectionEnabled) mNumberRollView.setNumber(0, false);
+        mNumberRollView.setNumber(selectedItems.size(), true);
+    }
+
     /**
      * Update internal state and notify observers that the theme color changed.
      * @param isLightTheme Whether or not the theme color is light.
@@ -592,7 +596,7 @@ public class SelectableListToolbar<E> extends Toolbar implements SelectionObserv
         for (SelectableListToolbarObserver o : mObservers) o.onThemeColorChanged(isLightTheme);
     }
 
-    private void updateDisplayStyleIfNecessary() {
+    protected void updateDisplayStyleIfNecessary() {

[Theresa, 2017/05/16 15:01:22]

nit: I think this can be private. If the photo picker uses a width-constrained
display style in the future, we can revisit.

[Finnur, 2017/05/16 16:08:02]

Done.

         if (mUiConfig != null) onDisplayStyleChanged(mUiConfig.getCurrentDisplayStyle());
     }