Expire / extend BTS histograms

- Android.[BTS].ExactTaskCreated: Extended until M91 as this is part of
the metrics for Notification Triggers currently running as an OT.
- Android.[BTS].MigrationToProto: Expired as the migration is now pretty
much over and we don't look at this metric anymore.

Bug: 1140008
Change-Id: Iafffbcdcc6904d0d0214e40004d7fb0c6872a2cf
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2491364Reviewed-by: Steven Holte <holte@chromium.org>
Reviewed-by: David Trainor <dtrainor@chromium.org>
Commit-Queue: Richard Knoll <knollr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#821177}

components/background_task_scheduler/internal/android/java/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerPrefs.java

@@ -95,7 +95,6 @@ public class BackgroundTaskSchedulerPrefs {
                 }
                 editor.putString(
                         String.valueOf(parsed.getTaskId()), getEmptySerializedScheduledTaskProto());
-                BackgroundTaskSchedulerUma.getInstance().reportMigrationToProto(parsed.getTaskId());
             }
             editor.apply();
         }

components/background_task_scheduler/internal/android/java/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerUma.java

@@ -160,12 +160,6 @@ public class BackgroundTaskSchedulerUma extends BackgroundTaskSchedulerExternalU
         cacheEvent("Android.BackgroundTaskScheduler.TaskRescheduled", 0);
     }
 
-    /** Reports metrics for migrating scheduled tasks to Protocol Buffer data format. */
-    public void reportMigrationToProto(int taskId) {
-        cacheEvent("Android.BackgroundTaskScheduler.MigrationToProto",
-                toUmaEnumValueFromTaskId(taskId));
-    }
-
     @Override
     public void reportTaskStartedNative(int taskId, boolean serviceManagerOnlyMode) {
         int umaEnumValue = toUmaEnumValueFromTaskId(taskId);

components/background_task_scheduler/internal/android/junit/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerPrefsTest.java

@@ -8,10 +8,6 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
 
 import android.content.SharedPreferences;
 import android.os.Build;
@@ -19,9 +15,6 @@ import android.os.Build;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.ArgumentMatchers;
-import org.mockito.MockitoAnnotations;
-import org.mockito.Spy;
 import org.robolectric.annotation.Config;
 import org.robolectric.util.ReflectionHelpers;
 
@@ -42,9 +35,6 @@ import java.util.concurrent.TimeUnit;
 @RunWith(BaseRobolectricTestRunner.class)
 @Config(manifest = Config.NONE)
 public class BackgroundTaskSchedulerPrefsTest {
-    @Spy
-    private BackgroundTaskSchedulerUma mUmaSpy;
-
     private TaskInfo mTask1;
     private TaskInfo mTask2;
 
@@ -57,10 +47,6 @@ public class BackgroundTaskSchedulerPrefsTest {
 
     @Before
     public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        BackgroundTaskSchedulerUma.setInstanceForTesting(mUmaSpy);
-        doNothing().when(mUmaSpy).assertNativeIsLoaded();
-
         TaskInfo.TimingInfo timingInfo1 =
                 TaskInfo.OneOffInfo.create().setWindowEndTimeMs(TimeUnit.DAYS.toMillis(1)).build();
         mTask1 = TaskInfo.createTask(TaskIds.TEST, timingInfo1).build();
@@ -213,13 +199,6 @@ public class BackgroundTaskSchedulerPrefsTest {
         editor.apply();
 
         BackgroundTaskSchedulerPrefs.migrateStoredTasksToProto();
-        verify(mUmaSpy, times(1))
-                .cacheEvent(eq("Android.BackgroundTaskScheduler.MigrationToProto"),
-                        ArgumentMatchers.eq(BackgroundTaskSchedulerUma.BACKGROUND_TASK_TEST));
-        verify(mUmaSpy, times(1))
-                .cacheEvent(eq("Android.BackgroundTaskScheduler.MigrationToProto"),
-                        ArgumentMatchers.eq(
-                                BackgroundTaskSchedulerUma.BACKGROUND_TASK_OFFLINE_PAGES));
 
         Set<Integer> taskIds = BackgroundTaskSchedulerPrefs.getScheduledTaskIds();
         assertTrue(taskIds.contains(mTask1.getTaskId()));
@@ -230,12 +209,5 @@ public class BackgroundTaskSchedulerPrefsTest {
                         .getClass());
 
         BackgroundTaskSchedulerPrefs.migrateStoredTasksToProto();
-        verify(mUmaSpy, times(1))
-                .cacheEvent(eq("Android.BackgroundTaskScheduler.MigrationToProto"),
-                        ArgumentMatchers.eq(BackgroundTaskSchedulerUma.BACKGROUND_TASK_TEST));
-        verify(mUmaSpy, times(1))
-                .cacheEvent(eq("Android.BackgroundTaskScheduler.MigrationToProto"),
-                        ArgumentMatchers.eq(
-                                BackgroundTaskSchedulerUma.BACKGROUND_TASK_OFFLINE_PAGES));
     }
 }

components/background_task_scheduler/internal/android/junit/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerUmaTest.java

@@ -306,16 +306,6 @@ public class BackgroundTaskSchedulerUmaTest {
                         ArgumentMatchers.eq(BackgroundTaskSchedulerUma.BACKGROUND_TASK_GCM));
     }
 
-    @Test
-    @Feature({"BackgroundTaskScheduler"})
-    public void testReportMigrationToProto() {
-        doNothing().when(mUmaSpy).cacheEvent(anyString(), anyInt());
-        BackgroundTaskSchedulerUma.getInstance().reportMigrationToProto(TaskIds.TEST);
-        verify(mUmaSpy, times(1))
-                .cacheEvent(eq("Android.BackgroundTaskScheduler.MigrationToProto"),
-                        ArgumentMatchers.eq(BackgroundTaskSchedulerUma.BACKGROUND_TASK_TEST));
-    }
-
     @Test
     @Feature({"BackgroundTaskScheduler"})
     public void testReportTaskStartedNativeFullBrowser() {

tools/metrics/histograms/histograms_xml/android/histograms.xml

@@ -115,7 +115,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.BackgroundTaskScheduler.ExactTaskCreated"
-    enum="BackgroundTaskId" expires_after="2020-12-01">
+    enum="BackgroundTaskId" expires_after="M91">
   <owner>ioanastefan@chromium.org</owner>
   <owner>nator@chromium.org</owner>
   <owner>knollr@chromium.org</owner>
@@ -127,6 +127,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Android.BackgroundTaskScheduler.MigrationToProto"
     enum="BackgroundTaskId" expires_after="2020-12-01">
+  <obsolete>
+    Removed in October 2020.
+  </obsolete>
   <owner>ioanastefan@chromium.org</owner>
   <owner>nator@chromium.org</owner>
   <owner>knollr@chromium.org</owner>