Remove TabModelSelectorUma, which is mostly dead code

Inline action "MobileTabSwitched". All other code is to record
"Tab.RestoreUserPersistence", which is obsolete.

Bug: 1138653
Change-Id: I86b0701713a541d2d448cfb602b86c9b043ee632
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2476958Reviewed-by: David Trainor <dtrainor@chromium.org>
Commit-Queue: Henrique Nakashima <hnakashima@chromium.org>
Cr-Commit-Position: refs/heads/master@{#821389}

chrome/android/chrome_java_sources.gni

@@ -1533,7 +1533,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorBase.java",
   "java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorImpl.java",
   "java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorProfileSupplier.java",
-  "java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorUma.java",
   "java/src/org/chromium/chrome/browser/tabmodel/TabPersistencePolicy.java",
   "java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStore.java",
   "java/src/org/chromium/chrome/browser/tabmodel/TabPersister.java",

chrome/android/java/src/org/chromium/chrome/browser/tabmodel/IncognitoTabModelImplCreator.java

@@ -22,7 +22,6 @@ import org.chromium.ui.base.WindowAndroid;
 class IncognitoTabModelImplCreator implements IncognitoTabModelDelegate {
     private final TabCreator mRegularTabCreator;
     private final TabCreator mIncognitoTabCreator;
-    private final TabModelSelectorUma mUma;
     private final TabModelOrderController mOrderController;
     private final TabContentManager mTabContentManager;
     private final TabPersistentStore mTabSaver;
@@ -45,7 +44,6 @@ class IncognitoTabModelImplCreator implements IncognitoTabModelDelegate {
      * @param windowAndroidSupplier The supplier to the {@link WindowAndroid} instance.
      * @param regularTabCreator   Creates regular tabs.
      * @param incognitoTabCreator Creates incognito tabs.
-     * @param uma                 Handles UMA tracking for the model.
      * @param orderController     Determines the order for inserting new Tabs.
      * @param tabContentManager   Manages the display content of the tab.
      * @param tabSaver            Handler for saving tabs.
@@ -54,14 +52,13 @@ class IncognitoTabModelImplCreator implements IncognitoTabModelDelegate {
      * @param modelDelegate       Delegate to handle external dependencies and interactions.
      */
     public IncognitoTabModelImplCreator(@Nullable Supplier<WindowAndroid> windowAndroidSupplier,
-            TabCreator regularTabCreator, TabCreator incognitoTabCreator, TabModelSelectorUma uma,
+            TabCreator regularTabCreator, TabCreator incognitoTabCreator,
             TabModelOrderController orderController, TabContentManager tabContentManager,
             TabPersistentStore tabSaver, NextTabPolicySupplier nextTabPolicySupplier,
             AsyncTabParamsManager asyncTabParamsManager, TabModelDelegate modelDelegate) {
         mWindowAndroidSupplier = windowAndroidSupplier;
         mRegularTabCreator = regularTabCreator;
         mIncognitoTabCreator = incognitoTabCreator;
-        mUma = uma;
         mOrderController = orderController;
         mTabContentManager = tabContentManager;
         mTabSaver = tabSaver;
@@ -91,7 +88,7 @@ class IncognitoTabModelImplCreator implements IncognitoTabModelDelegate {
     @Override
     public TabModel createTabModel() {
         Profile otrProfile = getOTRProfile();
-        return new TabModelImpl(otrProfile, false, mRegularTabCreator, mIncognitoTabCreator, mUma,
+        return new TabModelImpl(otrProfile, false, mRegularTabCreator, mIncognitoTabCreator,
                 mOrderController, mTabContentManager, mTabSaver, mNextTabPolicySupplier,
                 mAsyncTabParamsManager, mModelDelegate, false);
     }

chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelImpl.java

@@ -10,6 +10,7 @@ import androidx.annotation.Nullable;
 import org.chromium.base.MathUtils;
 import org.chromium.base.ObserverList;
 import org.chromium.base.TraceEvent;
+import org.chromium.base.metrics.RecordUserAction;
 import org.chromium.chrome.browser.ChromeTabbedActivity;
 import org.chromium.chrome.browser.compositor.layouts.content.TabContentManager;
 import org.chromium.chrome.browser.homepage.HomepageManager;
@@ -55,7 +56,6 @@ public class TabModelImpl extends TabModelJniBridge {
 
     private final TabCreator mRegularTabCreator;
     private final TabCreator mIncognitoTabCreator;
-    private final TabModelSelectorUma mUma;
     private final TabModelOrderController mOrderController;
     private final TabContentManager mTabContentManager;
     private final TabPersistentStore mTabSaver;
@@ -86,7 +86,7 @@ public class TabModelImpl extends TabModelJniBridge {
     private boolean mIsUndoSupported = true;
 
     public TabModelImpl(@NonNull Profile profile, boolean isTabbedActivity,
-            TabCreator regularTabCreator, TabCreator incognitoTabCreator, TabModelSelectorUma uma,
+            TabCreator regularTabCreator, TabCreator incognitoTabCreator,
             TabModelOrderController orderController, TabContentManager tabContentManager,
             TabPersistentStore tabSaver, NextTabPolicySupplier nextTabPolicySupplier,
             AsyncTabParamsManager asyncTabParamsManager, TabModelDelegate modelDelegate,
@@ -94,7 +94,6 @@ public class TabModelImpl extends TabModelJniBridge {
         super(profile, isTabbedActivity);
         mRegularTabCreator = regularTabCreator;
         mIncognitoTabCreator = incognitoTabCreator;
-        mUma = uma;
         mOrderController = orderController;
         mTabContentManager = tabContentManager;
         mTabSaver = tabSaver;
@@ -564,9 +563,9 @@ public class TabModelImpl extends TabModelJniBridge {
                 for (TabModelObserver obs : mObservers) obs.didSelectTab(tab, type, lastId);
 
                 boolean wasAlreadySelected = tab.getId() == lastId;
-                if (!wasAlreadySelected && type == TabSelectionType.FROM_USER && mUma != null) {
+                if (!wasAlreadySelected && type == TabSelectionType.FROM_USER) {
                     // We only want to record when the user actively switches to a different tab.
-                    mUma.userSwitchedToTab();
+                    RecordUserAction.record("MobileTabSwitched");
                 }
             }
         } finally {

chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorImpl.java

@@ -54,8 +54,6 @@ public class TabModelSelectorImpl extends TabModelSelectorBase implements TabMod
 
     private Tab mVisibleTab;
 
-    private final TabModelSelectorUma mUma;
-
     private CloseAllTabsDelegate mCloseAllTabsDelegate;
 
     private final Supplier<WindowAndroid> mWindowAndroidSupplier;
@@ -81,7 +79,6 @@ public class TabModelSelectorImpl extends TabModelSelectorBase implements TabMod
             boolean isTabbedActivity, boolean startIncognito) {
         super(tabCreatorManager, tabModelFilterFactory, startIncognito);
         mWindowAndroidSupplier = windowAndroidSupplier;
-        mUma = new TabModelSelectorUma(activity);
         final TabPersistentStoreObserver persistentStoreObserver =
                 new TabPersistentStoreObserver() {
             @Override
@@ -122,7 +119,6 @@ public class TabModelSelectorImpl extends TabModelSelectorBase implements TabMod
      * Should be called when the app starts showing a view with multiple tabs.
      */
     public void onTabsViewShown() {
-        mUma.onTabsViewShown();
     }
 
     /**
@@ -138,14 +134,14 @@ public class TabModelSelectorImpl extends TabModelSelectorBase implements TabMod
         ChromeTabCreator incognitoTabCreator =
                 (ChromeTabCreator) getTabCreatorManager().getTabCreator(true);
         TabModelImpl normalModel = new TabModelImpl(Profile.getLastUsedRegularProfile(),
-                mIsTabbedActivityForSync, regularTabCreator, incognitoTabCreator, mUma,
-                mOrderController, mTabContentManager, mTabSaver, mNextTabPolicySupplier,
-                mAsyncTabParamsManager, this, mIsUndoSupported);
+                mIsTabbedActivityForSync, regularTabCreator, incognitoTabCreator, mOrderController,
+                mTabContentManager, mTabSaver, mNextTabPolicySupplier, mAsyncTabParamsManager, this,
+                mIsUndoSupported);
         regularTabCreator.setTabModel(normalModel, mOrderController);
 
         IncognitoTabModel incognitoModel = new IncognitoTabModelImpl(
                 new IncognitoTabModelImplCreator(mWindowAndroidSupplier, regularTabCreator,
-                        incognitoTabCreator, mUma, mOrderController, mTabContentManager, mTabSaver,
+                        incognitoTabCreator, mOrderController, mTabContentManager, mTabSaver,
                         mNextTabPolicySupplier, mAsyncTabParamsManager, this));
         incognitoTabCreator.setTabModel(incognitoModel, mOrderController);
         onNativeLibraryReadyInternal(tabContentProvider, normalModel, incognitoModel);
@@ -194,18 +190,18 @@ public class TabModelSelectorImpl extends TabModelSelectorBase implements TabMod
 
             @Override
             public void onPageLoadFinished(Tab tab, String url) {
-                mUma.onPageLoadFinished(tab.getId());
+                tab.getId();
             }
 
             @Override
             public void onPageLoadFailed(Tab tab, int errorCode) {
-                mUma.onPageLoadFailed(tab.getId());
+                tab.getId();
             }
 
             @Override
             public void onCrash(Tab tab) {
                 if (SadTab.isShowing(tab)) mTabContentManager.removeTabThumbnail(tab.getId());
-                mUma.onTabCrashed(tab.getId());
+                tab.getId();
             }
 
             @Override
@@ -345,7 +341,6 @@ public class TabModelSelectorImpl extends TabModelSelectorBase implements TabMod
     @Override
     public void destroy() {
         mTabSaver.destroy();
-        mUma.destroy();
         super.destroy();
     }
 
@@ -400,7 +395,8 @@ public class TabModelSelectorImpl extends TabModelSelectorBase implements TabMod
         // http://crbug.com/316166.
         if (type != TabSelectionType.FROM_EXIT) {
             tab.show(type);
-            mUma.onShowTab(tab.getId(), tab.isBeingRestored());
+            tab.getId();
+            tab.isBeingRestored();
         }
     }
 

chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorUma.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.tabmodel;
-
-import android.app.Activity;
-import android.os.SystemClock;
-
-import org.chromium.base.ActivityState;
-import org.chromium.base.ApplicationStatus;
-import org.chromium.base.metrics.RecordHistogram;
-import org.chromium.base.metrics.RecordUserAction;
-
-/**
- * Centralizes UMA data collection for TabModelSelector. All calls must be made from the UI thread.
- */
-public final class TabModelSelectorUma implements ApplicationStatus.ActivityStateListener {
-    // TabRestoreUserAction defined in tools/metrics/histograms/histograms.xml.
-    private static final int USER_WAITED_FOR_RESTORE_COMPLETION = 0;
-    private static final int USER_LEFT_TAB_DURING_RESTORE = 1;
-    private static final int USER_LEFT_CHROME_DURING_RESTORE = 2;
-    private static final int USER_ACTION_DURING_RESTORE_MAX = 3;
-
-    // Id of the active tab being restored. Equals -1 when the active tab is not being restored.
-    private int mRestoredTabId = -1;
-    // Timestamp of the beginning of the most recent tab restore.
-    private long mRestoreStartedAtMsec = -1;
-
-    TabModelSelectorUma(Activity activity) {
-        ApplicationStatus.registerStateListenerForActivity(this, activity);
-    }
-
-    /**
-     * Cleans up any external dependencies of this class.
-     */
-    public void destroy() {
-        ApplicationStatus.unregisterActivityStateListener(this);
-    }
-
-    @Override
-    public void onActivityStateChange(Activity activity, int newState) {
-        if (newState != ActivityState.STOPPED) return;
-        if (mRestoredTabId != -1) {
-            recordUserActionDuringTabRestore(USER_LEFT_CHROME_DURING_RESTORE);
-            mRestoredTabId = -1;
-        }
-    }
-
-    void userSwitchedToTab() {
-        RecordUserAction.record("MobileTabSwitched");
-    }
-
-    void onShowTab(int tabId, boolean isBeingRestored) {
-        if (mRestoredTabId != -1 && tabId != mRestoredTabId) {
-            recordUserActionDuringTabRestore(USER_LEFT_TAB_DURING_RESTORE);
-            mRestoredTabId = -1;
-        }
-        if (isBeingRestored) {
-            mRestoredTabId = tabId;
-            mRestoreStartedAtMsec = nowMsec();
-        }
-    }
-
-    void onTabClosing(int tabId) {
-        if (mRestoredTabId != -1 && tabId == mRestoredTabId) {
-            recordUserActionDuringTabRestore(USER_LEFT_TAB_DURING_RESTORE);
-            mRestoredTabId = -1;
-        }
-    }
-
-    void onTabCrashed(int tabId) {
-        if (mRestoredTabId != -1 && tabId == mRestoredTabId) {
-            mRestoredTabId = -1;
-        }
-    }
-
-    void onPageLoadFinished(int tabId) {
-        if (mRestoredTabId != -1 && tabId == mRestoredTabId) {
-            recordUserActionDuringTabRestore(USER_WAITED_FOR_RESTORE_COMPLETION);
-            mRestoredTabId = -1;
-        }
-    }
-
-    void onPageLoadFailed(int tabId) {
-        if (mRestoredTabId != -1 && tabId == mRestoredTabId) {
-            assert mRestoreStartedAtMsec != -1;
-            // If the pageload fails very quickly we cannot argue that the user "waited for
-            // completion".
-            if (nowMsec() - mRestoreStartedAtMsec >= 5000) {
-                recordUserActionDuringTabRestore(USER_WAITED_FOR_RESTORE_COMPLETION);
-            }
-            mRestoredTabId = -1;
-        }
-    }
-
-    void onTabsViewShown() {
-        if (mRestoredTabId != -1) {
-            recordUserActionDuringTabRestore(USER_LEFT_TAB_DURING_RESTORE);
-            mRestoredTabId = -1;
-        }
-    }
-
-    private static long nowMsec() {
-        return SystemClock.elapsedRealtime();
-    }
-
-    /**
-     * Logs action to a UMA histogram.
-     */
-    private void recordUserActionDuringTabRestore(int action) {
-        assert action >= 0 && action < USER_ACTION_DURING_RESTORE_MAX;
-        RecordHistogram.recordEnumeratedHistogram(
-                "Tab.RestoreUserPersistence", action, USER_ACTION_DURING_RESTORE_MAX);
-    }
-}

chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorObserverTestRule.java

@@ -141,7 +141,7 @@ public class TabModelSelectorObserverTestRule extends ChromeBrowserTestRule {
                 TabModelOrderController orderController, TabContentManager tabContentManager,
                 TabPersistentStore tabPersistentStore, NextTabPolicySupplier nextTabPolicySupplier,
                 AsyncTabParamsManager asyncTabParamsManager, TabModelDelegate modelDelegate) {
-            super(profile, false, null, null, null, orderController, tabContentManager,
+            super(profile, false, null, null, orderController, tabContentManager,
                     tabPersistentStore, nextTabPolicySupplier, asyncTabParamsManager, modelDelegate,
                     false);
         }

chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/TabPersistentStoreTest.java

@@ -120,20 +120,19 @@ public class TabPersistentStoreTest {
                 public TabModelImpl call() {
                     return new TabModelImpl(Profile.getLastUsedRegularProfile(), false,
                             getTabCreatorManager().getTabCreator(false),
-                            getTabCreatorManager().getTabCreator(true), null,
-                            mTabModelOrderController, null, mTabPersistentStore,
-                            nextTabPolicySupplier, AsyncTabParamsManagerSingleton.getInstance(),
-                            TestTabModelSelector.this, true);
+                            getTabCreatorManager().getTabCreator(true), mTabModelOrderController,
+                            null, mTabPersistentStore, nextTabPolicySupplier,
+                            AsyncTabParamsManagerSingleton.getInstance(), TestTabModelSelector.this,
+                            true);
                 }
             };
             TabModelImpl regularTabModel = TestThreadUtils.runOnUiThreadBlocking(callable);
             IncognitoTabModel incognitoTabModel =
                     new IncognitoTabModelImpl(new IncognitoTabModelImplCreator(null,
                             getTabCreatorManager().getTabCreator(false),
-                            getTabCreatorManager().getTabCreator(true), null,
-                            mTabModelOrderController, null, mTabPersistentStore,
-                            nextTabPolicySupplier, AsyncTabParamsManagerSingleton.getInstance(),
-                            this));
+                            getTabCreatorManager().getTabCreator(true), mTabModelOrderController,
+                            null, mTabPersistentStore, nextTabPolicySupplier,
+                            AsyncTabParamsManagerSingleton.getInstance(), this));
             initialize(regularTabModel, incognitoTabModel);
         }