Revert "[BackgroundTaskScheduler] TaskInfo refactoring"

This reverts commit 8fb37f86.

Reason for revert: Browser crash, bug 995264

Original change's description:
> [BackgroundTaskScheduler] TaskInfo refactoring
> 
> The BackgroundTaskScheduler does not offer at the moment the possibility of scheduling a task at an exact moment. In preparation for this feature, the existing code is going to be updated first.
> 
> This CL refactors the way in which specific task information is kept. A more object-oriented approach is implemented, based on the discussion in this Design doc: https://docs.google.com/document/d/1o9BS5qwv10QVN3Df6W2m4QKjSo1DXdGIgLf8p2l0PYc/edit?usp=sharing. Changes have been made only in the way timing info for a task is kept and not in the way pre-requisites information is kept. Updates have also been added to the test files.
> 
> This change does not affect the interface exposed by the TaskInfo class.
> 
> TBR=rouslan@chromium.org
> 
> Bug: 970160
> Change-Id: I2985ca68da4e6db18f47e0fd1769db3138850cb0
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1707365
> Commit-Queue: Richard Knoll <knollr@chromium.org>
> Reviewed-by: Tommy Nyquist <nyquist@chromium.org>
> Reviewed-by: Mugdha Lakhani <nator@chromium.org>
> Reviewed-by: Richard Knoll <knollr@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#687603}

TBR=nyquist@chromium.org,nator@chromium.org,knollr@chromium.org,ioanastefan@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 970160
Change-Id: I199f9c5245ac659c733599cec3558d780f21be19
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1761050Reviewed-by: Krishna Govind <govind@chromium.org>
Commit-Queue: Krishna Govind <govind@chromium.org>
Cr-Commit-Position: refs/heads/master@{#688186}

chrome/android/BUILD.gn

@@ -2409,7 +2409,6 @@ generate_jni("chrome_jni_headers") {
     "java/src/org/chromium/chrome/browser/background_sync/BackgroundSyncBackgroundTaskScheduler.java",
     "java/src/org/chromium/chrome/browser/background_sync/BackgroundSyncPwaDetector.java",
     "java/src/org/chromium/chrome/browser/background_sync/PeriodicBackgroundSyncChromeWakeUpTask.java",
-    "java/src/org/chromium/chrome/browser/background_task_scheduler/ChromeBackgroundTaskFactory.java",
     "java/src/org/chromium/chrome/browser/banners/AppBannerManager.java",
     "java/src/org/chromium/chrome/browser/banners/AppBannerUiDelegateAndroid.java",
     "java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java",

chrome/android/java/src/org/chromium/chrome/browser/ChromeApplication.java

@@ -48,6 +48,7 @@ import org.chromium.chrome.browser.night_mode.SystemNightModeMonitor;
 import org.chromium.chrome.browser.preferences.ChromePreferenceManager;
 import org.chromium.chrome.browser.vr.OnExitVrRequestListener;
 import org.chromium.chrome.browser.vr.VrModuleProvider;
+import org.chromium.components.background_task_scheduler.BackgroundTaskSchedulerFactory;
 import org.chromium.components.embedder_support.application.FontPreloadingWorkaround;
 import org.chromium.components.module_installer.ModuleInstaller;
 import org.chromium.ui.base.ResourceBundle;
@@ -125,7 +126,8 @@ public class ChromeApplication extends Application {
             ModuleInstaller.getInstance().recordModuleAvailability();
 
             // Set Chrome factory for mapping BackgroundTask classes to TaskIds.
-            ChromeBackgroundTaskFactory.setAsDefault();
+            BackgroundTaskSchedulerFactory.setBackgroundTaskFactory(
+                    new ChromeBackgroundTaskFactory());
         }
 
         // Write installed modules to crash keys. This needs to be done as early as possible so that

chrome/android/java/src/org/chromium/chrome/browser/background_sync/BackgroundSyncBackgroundTaskScheduler.java

@@ -120,16 +120,14 @@ public class BackgroundSyncBackgroundTaskScheduler {
         Bundle taskExtras = new Bundle();
         taskExtras.putLong(SOONEST_EXPECTED_WAKETIME, System.currentTimeMillis() + minDelayMs);
 
-        TaskInfo.TimingInfo timingInfo = TaskInfo.OneOffInfo.create()
-                                                 .setWindowStartTimeMs(minDelayMs)
-                                                 .setWindowEndTimeMs(Integer.MAX_VALUE)
-                                                 .build();
-        TaskInfo taskInfo = TaskInfo.createTask(getAppropriateTaskId(taskType), timingInfo)
-                                    .setRequiredNetworkType(TaskInfo.NetworkType.ANY)
-                                    .setUpdateCurrent(true)
-                                    .setIsPersisted(true)
-                                    .setExtras(taskExtras)
-                                    .build();
+        TaskInfo taskInfo =
+                TaskInfo.createOneOffTask(getAppropriateTaskId(taskType),
+                                getAppropriateTaskClass(taskType), minDelayMs, Integer.MAX_VALUE)
+                        .setRequiredNetworkType(TaskInfo.NetworkType.ANY)
+                        .setUpdateCurrent(true)
+                        .setIsPersisted(true)
+                        .setExtras(taskExtras)
+                        .build();
         // This will overwrite any existing task with this ID.
         return BackgroundTaskSchedulerFactory.getScheduler().schedule(
                 ContextUtils.getApplicationContext(), taskInfo);

chrome/android/java/src/org/chromium/chrome/browser/background_task_scheduler/ChromeBackgroundTaskFactory.java

@@ -5,7 +5,6 @@
 package org.chromium.chrome.browser.background_task_scheduler;
 
 import org.chromium.base.Log;
-import org.chromium.base.annotations.CalledByNative;
 import org.chromium.chrome.browser.background_sync.BackgroundSyncBackgroundTask;
 import org.chromium.chrome.browser.background_sync.PeriodicBackgroundSyncChromeWakeUpTask;
 import org.chromium.chrome.browser.component_updater.UpdateTask;
@@ -23,7 +22,6 @@ import org.chromium.chrome.browser.services.gcm.GCMBackgroundTask;
 import org.chromium.chrome.browser.webapps.WebApkUpdateTask;
 import org.chromium.components.background_task_scheduler.BackgroundTask;
 import org.chromium.components.background_task_scheduler.BackgroundTaskFactory;
-import org.chromium.components.background_task_scheduler.BackgroundTaskSchedulerFactory;
 import org.chromium.components.background_task_scheduler.TaskIds;
 
 /**
@@ -32,16 +30,7 @@ import org.chromium.components.background_task_scheduler.TaskIds;
  */
 public class ChromeBackgroundTaskFactory implements BackgroundTaskFactory {
     private static final String TAG = "ChromeBkgrdTaskF";
-    private ChromeBackgroundTaskFactory() {}
-
-    private static class LazyHolder {
-        static final ChromeBackgroundTaskFactory INSTANCE = new ChromeBackgroundTaskFactory();
-    }
-
-    @CalledByNative
-    public static void setAsDefault() {
-        BackgroundTaskSchedulerFactory.setBackgroundTaskFactory(LazyHolder.INSTANCE);
-    }
+    public ChromeBackgroundTaskFactory() {}
 
     @Override
     public BackgroundTask getBackgroundTaskFromTaskId(int taskId) {

chrome/android/junit/src/org/chromium/chrome/browser/background_sync/BackgroundSyncBackgroundTaskSchedulerTest.java

@@ -28,7 +28,6 @@ import org.chromium.base.test.BaseRobolectricTestRunner;
 import org.chromium.base.test.util.Feature;
 import org.chromium.chrome.browser.ChromeFeatureList;
 import org.chromium.chrome.browser.background_sync.BackgroundSyncBackgroundTaskScheduler.BackgroundSyncTask;
-import org.chromium.chrome.browser.background_task_scheduler.ChromeBackgroundTaskFactory;
 import org.chromium.chrome.browser.background_task_scheduler.NativeBackgroundTask;
 import org.chromium.chrome.test.support.DisableHistogramsRule;
 import org.chromium.components.background_task_scheduler.BackgroundTaskScheduler;
@@ -58,7 +57,6 @@ public class BackgroundSyncBackgroundTaskSchedulerTest {
     public void setUp() throws Exception {
         MockitoAnnotations.initMocks(this);
         BackgroundTaskSchedulerFactory.setSchedulerForTesting(mTaskScheduler);
-        ChromeBackgroundTaskFactory.setAsDefault();
         HashMap<String, Boolean> features = new HashMap<String, Boolean>();
         features.put(ChromeFeatureList.BACKGROUND_TASK_SCHEDULER_FOR_BACKGROUND_SYNC, true);
         ChromeFeatureList.setTestFeatures(features);

chrome/android/junit/src/org/chromium/chrome/browser/webapps/WebApkUpdateManagerUnitTest.java

@@ -40,7 +40,6 @@ import org.chromium.base.test.BaseRobolectricTestRunner;
 import org.chromium.base.test.util.JniMocker;
 import org.chromium.blink_public.platform.WebDisplayMode;
 import org.chromium.chrome.browser.ShortcutHelper;
-import org.chromium.chrome.browser.background_task_scheduler.ChromeBackgroundTaskFactory;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.util.test.ShadowUrlUtilities;
 import org.chromium.chrome.test.support.DisableHistogramsRule;
@@ -500,8 +499,6 @@ public class WebApkUpdateManagerUnitTest {
         storage.updateTimeOfLastCheckForUpdatedWebManifest();
         storage.updateTimeOfLastWebApkUpdateRequestCompletion();
         storage.updateDidLastWebApkUpdateRequestSucceed(true);
-
-        ChromeBackgroundTaskFactory.setAsDefault();
     }
 
     @After

chrome/browser/BUILD.gn

@@ -2234,8 +2234,6 @@ jumbo_split_static_library("browser") {
       "android/background_sync_launcher_android.h",
       "android/background_tab_manager.cc",
       "android/background_tab_manager.h",
-      "android/background_task_scheduler/chrome_background_task_factory.cc",
-      "android/background_task_scheduler/chrome_background_task_factory.h",
       "android/bookmarks/bookmark_bridge.cc",
       "android/bookmarks/bookmark_bridge.h",
       "android/bookmarks/partner_bookmarks_reader.cc",

chrome/browser/android/background_task_scheduler/chrome_background_task_factory.cc

-// Copyright 2019 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.
-
-#include "chrome/browser/android/background_task_scheduler/chrome_background_task_factory.h"
-
-#include "chrome/android/chrome_jni_headers/ChromeBackgroundTaskFactory_jni.h"
-
-ChromeBackgroundTaskFactory::~ChromeBackgroundTaskFactory() = default;
-
-// static
-void ChromeBackgroundTaskFactory::SetAsDefault() {
-  JNIEnv* env = base::android::AttachCurrentThread();
-  Java_ChromeBackgroundTaskFactory_setAsDefault(env);
-}

chrome/browser/android/background_task_scheduler/chrome_background_task_factory.h

-// Copyright 2019 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.
-
-#ifndef CHROME_BROWSER_ANDROID_BACKGROUND_TASK_SCHEDULER_CHROME_BACKGROUND_TASK_FACTORY_H_
-#define CHROME_BROWSER_ANDROID_BACKGROUND_TASK_SCHEDULER_CHROME_BACKGROUND_TASK_FACTORY_H_
-
-// Intermediate that sets the ChromeBackgroundTaskFactory from C++. The C++ code
-// does not call ChromeApplication (java initializations), so this setting was
-// necessary for associating task ids with corresponding BackgroundTask classes
-// for BackgroundTaskScheduler. This class can be used to set the default
-// factory class to ChromeBackgroundTaskFactory by calling
-// ChromeBackgroundTaskFactory::SetAsDefault().
-class ChromeBackgroundTaskFactory {
- public:
-  // Disable default constructor.
-  ChromeBackgroundTaskFactory() = delete;
-
-  // Disable copy (and move) semantics.
-  ChromeBackgroundTaskFactory(const ChromeBackgroundTaskFactory&) = delete;
-  ChromeBackgroundTaskFactory& operator=(const ChromeBackgroundTaskFactory&) =
-      delete;
-
-  ~ChromeBackgroundTaskFactory();
-
-  // Sets the default factory implementation in //chrome for associating task
-  // ids with corresponding BackgroundTask classes.
-  static void SetAsDefault();
-};
-
-#endif  // CHROME_BROWSER_ANDROID_BACKGROUND_TASK_SCHEDULER_CHROME_BACKGROUND_TASK_FACTORY_H_

chrome/browser/payments/payment_request_can_make_payment_browsertest.cc

@@ -29,7 +29,6 @@
 #include "net/dns/mock_host_resolver.h"
 
 #if defined(OS_ANDROID)
-#include "chrome/browser/android/background_task_scheduler/chrome_background_task_factory.h"
 #include "chrome/test/base/android/android_browser_test.h"
 #else
 #include "chrome/test/base/in_process_browser_test.h"
@@ -77,10 +76,6 @@ class PaymentRequestCanMakePaymentTestBase : public PlatformBrowserTest,
         autofill::PersonalDataManagerFactory::GetForProfile(profile);
     personal_data_manager->SetSyncServiceForTest(&sync_service_);
 
-#if defined(OS_ANDROID)
-    ChromeBackgroundTaskFactory::SetAsDefault();
-#endif
-
     payment_request_controller_.SetUpOnMainThread();
   }
 

components/background_task_scheduler/README.md

@@ -62,13 +62,6 @@ no arguments.**
 A task must also have a unique ID, and it must be listed in `TaskIds` to ensure
 there is no overlap between different tasks.
 
-The connection between `TaskIds` and the corresponding `BackgroundTask` classes is done by injecting
-a `BackgroundTaskFactory` class in `BackgroundTaskSchedulerFactory`. For the //chrome embedder
-(which is the only one needing the association), the `ChromeBackgroundTaskFactory` [implementation]
-(https://cs.chromium.org/chromium/src/chrome/android/java/src/org/chromium/chrome/browser
-/background_task_scheduler/ChromeBackgroundTaskFactory.java) was created. Anyone that adds a new
-task id to `TaskIds` should add a case in this class to.
-
 ## How to schedule a task
 
 A task is scheduled by creating an object containing information about the task,
@@ -80,29 +73,21 @@ There are two main types of tasks; one-off tasks and periodic tasks. One-off
 tasks are only executed once, whereas periodic tasks are executed once per
 a defined interval.
 
-There are two steps in the process of creating a TaskInfo:
-
- 1. the specific timing info is created; there are two objects available - `OneOffInfo` and
- `PeriodicInfo`; each one of these objects has its own builder;
- 2. the task info is created using the `createTask` method; other parameters can be set afterwards.
-
 As an example for how to create a one-off task that executes in 200 minutes,
 you can do the following:
 
 ```java
-TaskInfo.TimingInfo oneOffInfo = TaskInfo.OneOffInfo.create()
-                                    .setWindowEndTimeMs(TimeUnit.MINUTES.toMillis(200)).build();
-TaskInfo taskInfo = TaskInfo.createTask(TaskIds.YOUR_FEATURE,
-                            oneOffInfo).build();
+TaskInfo.createOneOffTask(TaskIds.YOUR_FEATURE,
+                            MyBackgroundTask.class,
+                            TimeUnit.MINUTES.toMillis(200)).build();
 ```
 
 For a periodic task that executes every 200 minutes, you can call:
 
 ```java
-TaskInfo.TimingInfo periodicInfo = TaskInfo.PeriodicInfo.create()
-                                    .setIntervalMs(TimeUnit.MINUTES.toMillis(200)).build();
-TaskInfo taskInfo = TaskInfo.createTask(TaskIds.YOUR_FEATURE,
-                            periodicInfo).build();
+TaskInfo.createPeriodicTask(TaskIds.YOUR_FEATURE,
+                              MyBackgroundTask.class,
+                              TimeUnit.MINUTES.toMillis(200)).build();
 ```
 
 Typically you will also set other required parameters such as what type of
@@ -110,11 +95,12 @@ network conditions are necessary and whether the task requires the device to
 be charging. They can be set on the builder like this:
 
 ```java
-TaskInfo.TimingInfo oneOffInfo = TaskInfo.OneOffInfo.create()
-                                    .setWindowStartTimeMs(TimeUnit.MINUTES.toMillis(100))
-                                    .setWindowEndTimeMs(TimeUnit.MINUTES.toMillis(200)).build();
-TaskInfo taskInfo = TaskInfo.createTask(TaskIds.YOUR_FEATURE,
-                            oneOffInfo)
+TaskInfo.createOneOffTask(TaskIds.YOUR_FEATURE,
+                            MyBackgroundTask.class,
+                            /* windowStartTimeMs= */
+                            TimeUnit.MINUTES.toMillis(100)
+                            /* windowEndTimeMs= */
+                            TimeUnit.MINUTES.toMillis(200))
                           .setRequiresCharging(true)
                           .setRequiredNetworkType(
                             TaskInfo.NETWORK_TYPE_UNMETERED)
@@ -151,11 +137,10 @@ Bundle myBundle = new Bundle();
 myBundle.putString("foo", "bar");
 myBundle.putLong("number", 1337L);
 
-TaskInfo.TimingInfo oneOffInfo = TaskInfo.OneOffInfo.create()
-                                    .setWindowStartTimeMs(TimeUnit.MINUTES.toMillis(100))
-                                    .setWindowEndTimeMs(TimeUnit.MINUTES.toMillis(200)).build();
-TaskInfo taskInfo = TaskInfo.createTask(TaskIds.YOUR_FEATURE,
-                            oneOffInfo)
+TaskInfo.createOneOffTask(TaskIds.YOUR_FEATURE,
+                            MyBackgroundTask.class,
+                            TimeUnit.MINUTES.toMillis(100)
+                            TimeUnit.MINUTES.toMillis(200))
                           .setExtras(myBundle)
                           .build();
 ```
@@ -174,29 +159,6 @@ boolean onStartTask(Context context,
 }
 ```
 
-## Performing actions over TimingInfo objects
-
-To perform actions over the `TimingInfo` objects, based on their implementation, the Visitor design
-pattern was used. A public interface is exposed for this: `TimingInfoVisitor`. To use this
-interface, someone should create a class that would look like this:
-
-```java
-class ImplementedActionVisitor implements TaskInfo.TimingInfoVisitor {
-  @Override
-  public void visit(TaskInfo.OneOffInfo oneOffInfo) { ... }
-
-  @Override
-  public void visit(TaskInfo.PeriodicInfo periodicInfo) { ... }
-}
-```
-
-To use this visitor, someone would make the following calls:
-
-```java
-ImplementedActionVisitor visitor = new ImplementedActionVisitor();
-myTimingInfo.accept(visitor);
-```
-
 ## Loading Native parts
 
 Some of the tasks running in the background require native parts of the browser

components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskSchedulerGcmNetworkManager.java

@@ -84,13 +84,20 @@ class BackgroundTaskSchedulerGcmNetworkManager implements BackgroundTaskSchedule
     @VisibleForTesting
     static Task createTaskFromTaskInfo(@NonNull TaskInfo taskInfo) {
         Bundle taskExtras = new Bundle();
+        if (!taskInfo.isPeriodic() && taskInfo.getOneOffInfo().expiresAfterWindowEndTime()) {
+            taskExtras.putLong(BACKGROUND_TASK_DEADLINE_KEY, getDeadlineTime(taskInfo));
+        }
         taskExtras.putBundle(BACKGROUND_TASK_EXTRAS_KEY, taskInfo.getExtras());
 
-        TaskBuilderVisitor taskBuilderVisitor = new TaskBuilderVisitor(taskExtras);
-        taskInfo.getTimingInfo().accept(taskBuilderVisitor);
-        Task.Builder builder = taskBuilderVisitor.getBuilder();
+        Task.Builder builder;
+        if (taskInfo.isPeriodic()) {
+            builder = getPeriodicTaskBuilder(taskInfo.getPeriodicInfo());
+        } else {
+            builder = getOneOffTaskBuilder(taskInfo.getOneOffInfo());
+        }
 
-        builder.setPersisted(taskInfo.isPersisted())
+        builder.setExtras(taskExtras)
+                .setPersisted(taskInfo.isPersisted())
                 .setRequiredNetwork(getGcmNetworkManagerNetworkTypeFromTypeFromTaskNetworkType(
                         taskInfo.getRequiredNetworkType()))
                 .setRequiresCharging(taskInfo.requiresCharging())
@@ -101,49 +108,27 @@ class BackgroundTaskSchedulerGcmNetworkManager implements BackgroundTaskSchedule
         return builder.build();
     }
 
-    private static class TaskBuilderVisitor implements TaskInfo.TimingInfoVisitor {
-        private Task.Builder mBuilder;
-        private final Bundle mTaskExtras;
-
-        TaskBuilderVisitor(Bundle taskExtras) {
-            mTaskExtras = taskExtras;
-        }
-
-        // Only valid after a TimingInfo object was visited.
-        Task.Builder getBuilder() {
-            return mBuilder;
-        }
-
-        @Override
-        public void visit(TaskInfo.OneOffInfo oneOffInfo) {
-            if (oneOffInfo.expiresAfterWindowEndTime()) {
-                mTaskExtras.putLong(BACKGROUND_TASK_DEADLINE_KEY,
-                        sClock.currentTimeMillis() + oneOffInfo.getWindowEndTimeMs());
-            }
-
-            OneoffTask.Builder builder = new OneoffTask.Builder();
-            long windowStartSeconds = oneOffInfo.hasWindowStartTimeConstraint()
-                    ? TimeUnit.MILLISECONDS.toSeconds(oneOffInfo.getWindowStartTimeMs())
-                    : 0;
-            long windowEndTimeMs = oneOffInfo.getWindowEndTimeMs();
-            if (oneOffInfo.expiresAfterWindowEndTime()) {
-                windowEndTimeMs += DEADLINE_DELTA_MS;
-            }
-            builder.setExecutionWindow(
-                    windowStartSeconds, TimeUnit.MILLISECONDS.toSeconds(windowEndTimeMs));
-            builder.setExtras(mTaskExtras);
-            mBuilder = builder;
+    private static Task.Builder getPeriodicTaskBuilder(TaskInfo.PeriodicInfo periodicInfo) {
+        PeriodicTask.Builder builder = new PeriodicTask.Builder();
+        builder.setPeriod(TimeUnit.MILLISECONDS.toSeconds(periodicInfo.getIntervalMs()));
+        if (periodicInfo.hasFlex()) {
+            builder.setFlex(TimeUnit.MILLISECONDS.toSeconds(periodicInfo.getFlexMs()));
         }
+        return builder;
+    }
 
-        @Override
-        public void visit(TaskInfo.PeriodicInfo periodicInfo) {
-            PeriodicTask.Builder builder = new PeriodicTask.Builder();
-            builder.setPeriod(TimeUnit.MILLISECONDS.toSeconds(periodicInfo.getIntervalMs()));
-            if (periodicInfo.hasFlex()) {
-                builder.setFlex(TimeUnit.MILLISECONDS.toSeconds(periodicInfo.getFlexMs()));
-            }
-            mBuilder = builder;
+    private static Task.Builder getOneOffTaskBuilder(TaskInfo.OneOffInfo oneOffInfo) {
+        OneoffTask.Builder builder = new OneoffTask.Builder();
+        long windowStartSeconds = oneOffInfo.hasWindowStartTimeConstraint()
+                ? TimeUnit.MILLISECONDS.toSeconds(oneOffInfo.getWindowStartTimeMs())
+                : 0;
+        long windowEndTimeMs = oneOffInfo.getWindowEndTimeMs();
+        if (oneOffInfo.expiresAfterWindowEndTime()) {
+            windowEndTimeMs += DEADLINE_DELTA_MS;
         }
+        builder.setExecutionWindow(
+                windowStartSeconds, TimeUnit.MILLISECONDS.toSeconds(windowEndTimeMs));
+        return builder;
     }
 
     private static int getGcmNetworkManagerNetworkTypeFromTypeFromTaskNetworkType(

components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskSchedulerImpl.java

@@ -46,12 +46,10 @@ class BackgroundTaskSchedulerImpl implements BackgroundTaskScheduler {
             boolean success = mSchedulerDelegate.schedule(context, taskInfo);
             BackgroundTaskSchedulerUma.getInstance().reportTaskScheduled(
                     taskInfo.getTaskId(), success);
-
-            // Retain expiration metrics
-            ExpirationMetricsVisitor expirationMetricsVisitor =
-                    new ExpirationMetricsVisitor(taskInfo.getTaskId());
-            taskInfo.getTimingInfo().accept(expirationMetricsVisitor);
-
+            if (!taskInfo.isPeriodic()) {
+                BackgroundTaskSchedulerUma.getInstance().reportTaskCreatedAndExpirationState(
+                        taskInfo.getTaskId(), taskInfo.getOneOffInfo().expiresAfterWindowEndTime());
+            }
             if (success) {
                 BackgroundTaskSchedulerPrefs.addScheduledTask(taskInfo);
             }
@@ -59,26 +57,6 @@ class BackgroundTaskSchedulerImpl implements BackgroundTaskScheduler {
         }
     }
 
-    private class ExpirationMetricsVisitor implements TaskInfo.TimingInfoVisitor {
-        private final int mTaskId;
-
-        ExpirationMetricsVisitor(int taskId) {
-            mTaskId = taskId;
-        }
-
-        @Override
-        public void visit(TaskInfo.OneOffInfo oneOffInfo) {
-            BackgroundTaskSchedulerUma.getInstance().reportTaskCreatedAndExpirationState(
-                    mTaskId, oneOffInfo.expiresAfterWindowEndTime());
-        }
-
-        @Override
-        public void visit(TaskInfo.PeriodicInfo periodicInfo) {
-            BackgroundTaskSchedulerUma.getInstance().reportTaskCreatedAndExpirationState(
-                    mTaskId, periodicInfo.expiresAfterWindowEndTime());
-        }
-    }
-
     @Override
     public void cancel(Context context, int taskId) {
         try (TraceEvent te = TraceEvent.scoped(

components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskSchedulerJobService.java

@@ -48,6 +48,11 @@ class BackgroundTaskSchedulerJobService implements BackgroundTaskSchedulerDelega
         return extras.getLong(BACKGROUND_TASK_DEADLINE_KEY);
     }
 
+    private static long getDeadlineTime(TaskInfo taskInfo) {
+        long windowEndTimeMs = taskInfo.getOneOffInfo().getWindowEndTimeMs();
+        return sClock.currentTimeMillis() + windowEndTimeMs;
+    }
+
     /**
      * Retrieves the {@link TaskParameters} from the {@link JobParameters}, which are passed as
      * one of the keys. Only values valid for {@link android.os.BaseBundle} are supported, and other
@@ -74,6 +79,10 @@ class BackgroundTaskSchedulerJobService implements BackgroundTaskSchedulerDelega
     static JobInfo createJobInfoFromTaskInfo(Context context, TaskInfo taskInfo) {
         PersistableBundle jobExtras = new PersistableBundle();
 
+        if (!taskInfo.isPeriodic() && taskInfo.getOneOffInfo().expiresAfterWindowEndTime()) {
+            jobExtras.putLong(BACKGROUND_TASK_DEADLINE_KEY, getDeadlineTime(taskInfo));
+        }
+
         PersistableBundle persistableBundle = getTaskExtrasAsPersistableBundle(taskInfo);
         jobExtras.putPersistableBundle(BACKGROUND_TASK_EXTRAS_KEY, persistableBundle);
 
@@ -81,60 +90,42 @@ class BackgroundTaskSchedulerJobService implements BackgroundTaskSchedulerDelega
                 new JobInfo
                         .Builder(taskInfo.getTaskId(),
                                 new ComponentName(context, BackgroundTaskJobService.class))
+                        .setExtras(jobExtras)
                         .setPersisted(taskInfo.isPersisted())
                         .setRequiresCharging(taskInfo.requiresCharging())
                         .setRequiredNetworkType(getJobInfoNetworkTypeFromTaskNetworkType(
                                 taskInfo.getRequiredNetworkType()));
 
-        JobInfoBuilderVisitor jobInfoBuilderVisitor = new JobInfoBuilderVisitor(builder, jobExtras);
-        taskInfo.getTimingInfo().accept(jobInfoBuilderVisitor);
-        builder = jobInfoBuilderVisitor.getBuilder();
+        if (taskInfo.isPeriodic()) {
+            builder = getPeriodicJobInfo(builder, taskInfo);
+        } else {
+            builder = getOneOffJobInfo(builder, taskInfo);
+        }
 
         return builder.build();
     }
 
-    private static class JobInfoBuilderVisitor implements TaskInfo.TimingInfoVisitor {
-        private final JobInfo.Builder mBuilder;
-        private final PersistableBundle mJobExtras;
-
-        JobInfoBuilderVisitor(JobInfo.Builder builder, PersistableBundle jobExtras) {
-            mBuilder = builder;
-            mJobExtras = jobExtras;
+    private static JobInfo.Builder getOneOffJobInfo(JobInfo.Builder builder, TaskInfo taskInfo) {
+        TaskInfo.OneOffInfo oneOffInfo = taskInfo.getOneOffInfo();
+        if (oneOffInfo.hasWindowStartTimeConstraint()) {
+            builder = builder.setMinimumLatency(oneOffInfo.getWindowStartTimeMs());
         }
-
-        // Only valid after a TimingInfo object was visited.
-        JobInfo.Builder getBuilder() {
-            return mBuilder;
+        long windowEndTimeMs = oneOffInfo.getWindowEndTimeMs();
+        if (oneOffInfo.expiresAfterWindowEndTime()) {
+            windowEndTimeMs += DEADLINE_DELTA_MS;
         }
+        return builder.setOverrideDeadline(windowEndTimeMs);
+    }
 
-        @Override
-        public void visit(TaskInfo.OneOffInfo oneOffInfo) {
-            if (oneOffInfo.expiresAfterWindowEndTime()) {
-                mJobExtras.putLong(BACKGROUND_TASK_DEADLINE_KEY,
-                        sClock.currentTimeMillis() + oneOffInfo.getWindowEndTimeMs());
-            }
-            mBuilder.setExtras(mJobExtras);
-
-            if (oneOffInfo.hasWindowStartTimeConstraint()) {
-                mBuilder.setMinimumLatency(oneOffInfo.getWindowStartTimeMs());
-            }
-            long windowEndTimeMs = oneOffInfo.getWindowEndTimeMs();
-            if (oneOffInfo.expiresAfterWindowEndTime()) {
-                windowEndTimeMs += DEADLINE_DELTA_MS;
-            }
-            mBuilder.setOverrideDeadline(windowEndTimeMs);
-        }
-
-        @Override
-        public void visit(TaskInfo.PeriodicInfo periodicInfo) {
-            mBuilder.setExtras(mJobExtras);
-
-            if (periodicInfo.hasFlex() && Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-                mBuilder.setPeriodic(periodicInfo.getIntervalMs(), periodicInfo.getFlexMs());
-                return;
+    private static JobInfo.Builder getPeriodicJobInfo(JobInfo.Builder builder, TaskInfo taskInfo) {
+        TaskInfo.PeriodicInfo periodicInfo = taskInfo.getPeriodicInfo();
+        if (periodicInfo.hasFlex()) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                return builder.setPeriodic(periodicInfo.getIntervalMs(), periodicInfo.getFlexMs());
             }
-            mBuilder.setPeriodic(periodicInfo.getIntervalMs());
+            return builder.setPeriodic(periodicInfo.getIntervalMs());
         }
+        return builder.setPeriodic(periodicInfo.getIntervalMs());
     }
 
     private static int getJobInfoNetworkTypeFromTaskNetworkType(

components/background_task_scheduler/android/javatests/src/org/chromium/components/background_task_scheduler/BackgroundTaskSchedulerImplWithMockTest.java

@@ -42,11 +42,9 @@ public class BackgroundTaskSchedulerImplWithMockTest {
     @Test
     @SmallTest
     public void testOneOffTaskScheduling() {
-        TaskInfo.TimingInfo timingInfo =
-                TaskInfo.OneOffInfo.create()
-                        .setWindowEndTimeMs(TimeUnit.MINUTES.toMillis(TEST_MINUTES))
-                        .build();
-        TaskInfo oneOffTask = TaskInfo.createTask(TaskIds.TEST, timingInfo).build();
+        TaskInfo oneOffTask = TaskInfo.createOneOffTask(TaskIds.TEST, TestBackgroundTask.class,
+                                              TimeUnit.MINUTES.toMillis(TEST_MINUTES))
+                                      .build();
 
         MockBackgroundTaskSchedulerDelegate delegate = new MockBackgroundTaskSchedulerDelegate();
         BackgroundTaskScheduler taskScheduler = new BackgroundTaskSchedulerImpl(delegate);
@@ -61,11 +59,9 @@ public class BackgroundTaskSchedulerImplWithMockTest {
     @Test
     @SmallTest
     public void testPeriodicTaskScheduling() {
-        TaskInfo.TimingInfo timingInfo =
-                TaskInfo.PeriodicInfo.create()
-                        .setIntervalMs(TimeUnit.MINUTES.toMillis(TEST_MINUTES))
-                        .build();
-        TaskInfo periodicTask = TaskInfo.createTask(TaskIds.TEST, timingInfo).build();
+        TaskInfo periodicTask = TaskInfo.createPeriodicTask(TaskIds.TEST, TestBackgroundTask.class,
+                                                TimeUnit.MINUTES.toMillis(TEST_MINUTES))
+                                        .build();
 
         MockBackgroundTaskSchedulerDelegate delegate = new MockBackgroundTaskSchedulerDelegate();
         BackgroundTaskScheduler taskScheduler = new BackgroundTaskSchedulerImpl(delegate);

components/background_task_scheduler/android/javatests/src/org/chromium/components/background_task_scheduler/BackgroundTaskSchedulerJobServiceTest.java

@@ -64,9 +64,9 @@ public class BackgroundTaskSchedulerJobServiceTest {
     @Test
     @SmallTest
     public void testOneOffTaskWithDeadline() {
-        TaskInfo.TimingInfo timingInfo =
-                TaskInfo.OneOffInfo.create().setWindowEndTimeMs(TIME_200_MIN_TO_MS).build();
-        TaskInfo oneOffTask = TaskInfo.createTask(TaskIds.TEST, timingInfo).build();
+        TaskInfo oneOffTask = TaskInfo.createOneOffTask(TaskIds.TEST, TestBackgroundTask.class,
+                                              TIME_200_MIN_TO_MS)
+                                      .build();
         JobInfo jobInfo = BackgroundTaskSchedulerJobService.createJobInfoFromTaskInfo(
                 InstrumentationRegistry.getTargetContext(), oneOffTask);
         Assert.assertEquals(oneOffTask.getTaskId(), jobInfo.getId());
@@ -77,11 +77,10 @@ public class BackgroundTaskSchedulerJobServiceTest {
     @Test
     @SmallTest
     public void testOneOffTaskWithDeadlineAndExpiration() {
-        TaskInfo.TimingInfo timingInfo = TaskInfo.OneOffInfo.create()
-                                                 .setWindowEndTimeMs(TIME_200_MIN_TO_MS)
-                                                 .setExpiresAfterWindowEndTime(true)
-                                                 .build();
-        TaskInfo oneOffTask = TaskInfo.createTask(TaskIds.TEST, timingInfo).build();
+        TaskInfo oneOffTask = TaskInfo.createOneOffTask(TaskIds.TEST, TestBackgroundTask.class,
+                                              TIME_200_MIN_TO_MS)
+                                      .setExpiresAfterWindowEndTime(true)
+                                      .build();
         JobInfo jobInfo = BackgroundTaskSchedulerJobService.createJobInfoFromTaskInfo(
                 InstrumentationRegistry.getTargetContext(), oneOffTask);
         Assert.assertEquals(END_TIME_WITH_DEADLINE_MS, jobInfo.getMaxExecutionDelayMillis());
@@ -93,11 +92,9 @@ public class BackgroundTaskSchedulerJobServiceTest {
     @Test
     @SmallTest
     public void testOneOffTaskWithWindow() {
-        TaskInfo.TimingInfo timingInfo = TaskInfo.OneOffInfo.create()
-                                                 .setWindowStartTimeMs(TIME_100_MIN_TO_MS)
-                                                 .setWindowEndTimeMs(TIME_200_MIN_TO_MS)
-                                                 .build();
-        TaskInfo oneOffTask = TaskInfo.createTask(TaskIds.TEST, timingInfo).build();
+        TaskInfo oneOffTask = TaskInfo.createOneOffTask(TaskIds.TEST, TestBackgroundTask.class,
+                                              TIME_100_MIN_TO_MS, TIME_200_MIN_TO_MS)
+                                      .build();
         JobInfo jobInfo = BackgroundTaskSchedulerJobService.createJobInfoFromTaskInfo(
                 InstrumentationRegistry.getTargetContext(), oneOffTask);
         Assert.assertEquals(oneOffTask.getTaskId(), jobInfo.getId());
@@ -109,12 +106,10 @@ public class BackgroundTaskSchedulerJobServiceTest {
     @Test
     @SmallTest
     public void testOneOffTaskWithWindowAndExpiration() {
-        TaskInfo.TimingInfo timingInfo = TaskInfo.OneOffInfo.create()
-                                                 .setWindowStartTimeMs(TIME_100_MIN_TO_MS)
-                                                 .setWindowEndTimeMs(TIME_200_MIN_TO_MS)
-                                                 .setExpiresAfterWindowEndTime(true)
-                                                 .build();
-        TaskInfo oneOffTask = TaskInfo.createTask(TaskIds.TEST, timingInfo).build();
+        TaskInfo oneOffTask = TaskInfo.createOneOffTask(TaskIds.TEST, TestBackgroundTask.class,
+                                              TIME_100_MIN_TO_MS, TIME_200_MIN_TO_MS)
+                                      .setExpiresAfterWindowEndTime(true)
+                                      .build();
         JobInfo jobInfo = BackgroundTaskSchedulerJobService.createJobInfoFromTaskInfo(
                 InstrumentationRegistry.getTargetContext(), oneOffTask);
         Assert.assertEquals(
@@ -128,9 +123,9 @@ public class BackgroundTaskSchedulerJobServiceTest {
     @Test
     @SmallTest
     public void testPeriodicTaskWithoutFlex() {
-        TaskInfo.TimingInfo timingInfo =
-                TaskInfo.PeriodicInfo.create().setIntervalMs(TIME_200_MIN_TO_MS).build();
-        TaskInfo periodicTask = TaskInfo.createTask(TaskIds.TEST, timingInfo).build();
+        TaskInfo periodicTask = TaskInfo.createPeriodicTask(TaskIds.TEST, TestBackgroundTask.class,
+                                                TIME_200_MIN_TO_MS)
+                                        .build();
         JobInfo jobInfo = BackgroundTaskSchedulerJobService.createJobInfoFromTaskInfo(
                 InstrumentationRegistry.getTargetContext(), periodicTask);
         Assert.assertEquals(periodicTask.getTaskId(), jobInfo.getId());
@@ -141,11 +136,9 @@ public class BackgroundTaskSchedulerJobServiceTest {
     @Test
     @SmallTest
     public void testPeriodicTaskWithFlex() {
-        TaskInfo.TimingInfo timingInfo = TaskInfo.PeriodicInfo.create()
-                                                 .setIntervalMs(TIME_200_MIN_TO_MS)
-                                                 .setFlexMs(TIME_50_MIN_TO_MS)
-                                                 .build();
-        TaskInfo periodicTask = TaskInfo.createTask(TaskIds.TEST, timingInfo).build();
+        TaskInfo periodicTask = TaskInfo.createPeriodicTask(TaskIds.TEST, TestBackgroundTask.class,
+                                                TIME_200_MIN_TO_MS, TIME_50_MIN_TO_MS)
+                                        .build();
         JobInfo jobInfo = BackgroundTaskSchedulerJobService.createJobInfoFromTaskInfo(
                 InstrumentationRegistry.getTargetContext(), periodicTask);
         Assert.assertEquals(TIME_200_MIN_TO_MS, jobInfo.getIntervalMillis());
@@ -161,10 +154,10 @@ public class BackgroundTaskSchedulerJobServiceTest {
         taskExtras.putString("foo", "bar");
         taskExtras.putBoolean("bools", true);
         taskExtras.putLong("longs", 1342543L);
-        TaskInfo.TimingInfo timingInfo =
-                TaskInfo.OneOffInfo.create().setWindowEndTimeMs(TIME_200_MIN_TO_MS).build();
-        TaskInfo oneOffTask =
-                TaskInfo.createTask(TaskIds.TEST, timingInfo).setExtras(taskExtras).build();
+        TaskInfo oneOffTask = TaskInfo.createOneOffTask(TaskIds.TEST, TestBackgroundTask.class,
+                                              TIME_200_MIN_TO_MS)
+                                      .setExtras(taskExtras)
+                                      .build();
         JobInfo jobInfo = BackgroundTaskSchedulerJobService.createJobInfoFromTaskInfo(
                 InstrumentationRegistry.getTargetContext(), oneOffTask);
         Assert.assertEquals(oneOffTask.getTaskId(), jobInfo.getId());
@@ -180,9 +173,8 @@ public class BackgroundTaskSchedulerJobServiceTest {
     @Test
     @SmallTest
     public void testTaskInfoWithManyConstraints() {
-        TaskInfo.TimingInfo timingInfo =
-                TaskInfo.OneOffInfo.create().setWindowEndTimeMs(TIME_200_MIN_TO_MS).build();
-        TaskInfo.Builder taskBuilder = TaskInfo.createTask(TaskIds.TEST, timingInfo);
+        TaskInfo.Builder taskBuilder = TaskInfo.createOneOffTask(
+                TaskIds.TEST, TestBackgroundTask.class, TIME_200_MIN_TO_MS);
 
         JobInfo jobInfo = BackgroundTaskSchedulerJobService.createJobInfoFromTaskInfo(
                 InstrumentationRegistry.getTargetContext(),

components/background_task_scheduler/android/junit/src/org/chromium/components/background_task_scheduler/BackgroundTaskGcmTaskServiceTest.java

@@ -199,9 +199,9 @@ public class BackgroundTaskGcmTaskServiceTest {
 
         ReflectionHelpers.setStaticField(
                 Build.VERSION.class, "SDK_INT", Build.VERSION_CODES.LOLLIPOP);
-        TaskInfo.TimingInfo timingInfo =
-                TaskInfo.OneOffInfo.create().setWindowEndTimeMs(TimeUnit.DAYS.toMillis(1)).build();
-        TaskInfo task = TaskInfo.createTask(TaskIds.TEST, timingInfo).build();
+        TaskInfo task = TaskInfo.createOneOffTask(TaskIds.TEST, TestBackgroundTask.class,
+                                        TimeUnit.DAYS.toMillis(1))
+                                .build();
         BackgroundTaskSchedulerPrefs.addScheduledTask(task);
         assertEquals(0, TestBackgroundTask.getRescheduleCalls());
 
@@ -215,9 +215,9 @@ public class BackgroundTaskGcmTaskServiceTest {
         BackgroundTaskSchedulerFactory.setBackgroundTaskFactory(new TestBackgroundTaskFactory());
 
         ReflectionHelpers.setStaticField(Build.VERSION.class, "SDK_INT", Build.VERSION_CODES.M);
-        TaskInfo.TimingInfo timingInfo =
-                TaskInfo.OneOffInfo.create().setWindowEndTimeMs(TimeUnit.DAYS.toMillis(1)).build();
-        TaskInfo task = TaskInfo.createTask(TaskIds.TEST, timingInfo).build();
+        TaskInfo task = TaskInfo.createOneOffTask(TaskIds.TEST, TestBackgroundTask.class,
+                                        TimeUnit.DAYS.toMillis(1))
+                                .build();
         BackgroundTaskSchedulerPrefs.addScheduledTask(task);
         assertEquals(0, TestBackgroundTask.getRescheduleCalls());
 

components/background_task_scheduler/android/junit/src/org/chromium/components/background_task_scheduler/BackgroundTaskSchedulerImplTest.java

@@ -65,16 +65,13 @@ public class BackgroundTaskSchedulerImplTest {
         mGcmNetworkManager = (ShadowGcmNetworkManager) Shadow.extract(
                 GcmNetworkManager.getInstance(ContextUtils.getApplicationContext()));
 
-        TaskInfo.TimingInfo timingInfo =
-                TaskInfo.OneOffInfo.create().setWindowEndTimeMs(TimeUnit.DAYS.toMillis(1)).build();
-        mTask = TaskInfo.createTask(TaskIds.TEST, timingInfo).build();
-        TaskInfo.TimingInfo expirationTimingInfo =
-                TaskInfo.OneOffInfo.create()
-                        .setWindowEndTimeMs(TimeUnit.DAYS.toMillis(1))
-                        .setExpiresAfterWindowEndTime(true)
+        mTask = TaskInfo.createOneOffTask(
+                                TaskIds.TEST, TestBackgroundTask.class, TimeUnit.DAYS.toMillis(1))
                         .build();
-        mExpirationTask = TaskInfo.createTask(TaskIds.TEST, expirationTimingInfo).build();
-
+        mExpirationTask = TaskInfo.createOneOffTask(TaskIds.TEST, TestBackgroundTask.class,
+                                          TimeUnit.DAYS.toMillis(1))
+                                  .setExpiresAfterWindowEndTime(true)
+                                  .build();
         BackgroundTaskSchedulerFactory.setBackgroundTaskFactory(new TestBackgroundTaskFactory());
     }
 

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

@@ -41,28 +41,19 @@ public class BackgroundTaskSchedulerPrefsTest {
     private TaskInfo mTask1;
     private TaskInfo mTask2;
 
-    private class AllValidTestBackgroundTaskFactory implements BackgroundTaskFactory {
-        @Override
-        public BackgroundTask getBackgroundTaskFromTaskId(int taskId) {
-            return new TestBackgroundTask();
-        }
-    }
-
     @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();
-        TaskInfo.TimingInfo timingInfo2 =
-                TaskInfo.OneOffInfo.create().setWindowEndTimeMs(TimeUnit.DAYS.toMillis(1)).build();
-        mTask2 = TaskInfo.createTask(TaskIds.OFFLINE_PAGES_BACKGROUND_JOB_ID, timingInfo2).build();
-
-        BackgroundTaskSchedulerFactory.setBackgroundTaskFactory(
-                new AllValidTestBackgroundTaskFactory());
+        mTask1 = TaskInfo.createOneOffTask(
+                                 TaskIds.TEST, TestBackgroundTask.class, TimeUnit.DAYS.toMillis(1))
+                         .build();
+        mTask2 = TaskInfo.createOneOffTask(TaskIds.OFFLINE_PAGES_BACKGROUND_JOB_ID,
+                                 TestBackgroundTask.class, TimeUnit.DAYS.toMillis(1))
+                         .build();
+        BackgroundTaskSchedulerFactory.setBackgroundTaskFactory(new TestBackgroundTaskFactory());
     }
 
     @Test
@@ -79,10 +70,9 @@ public class BackgroundTaskSchedulerPrefsTest {
         BackgroundTaskSchedulerPrefs.addScheduledTask(mTask2);
         assertEquals("There should be 2 tasks in shared prefs.", 2,
                 BackgroundTaskSchedulerPrefs.getScheduledTaskIds().size());
-
-        TaskInfo.TimingInfo timingInfo =
-                TaskInfo.OneOffInfo.create().setWindowEndTimeMs(TimeUnit.DAYS.toMillis(1)).build();
-        TaskInfo task3 = TaskInfo.createTask(TaskIds.OMAHA_JOB_ID, timingInfo).build();
+        TaskInfo task3 = TaskInfo.createOneOffTask(TaskIds.OMAHA_JOB_ID, TestBackgroundTask.class,
+                                         TimeUnit.DAYS.toMillis(1))
+                                 .build();
 
         BackgroundTaskSchedulerPrefs.addScheduledTask(task3);
         assertEquals("There should be 3 tasks in shared prefs.", 3,

components/background_task_scheduler/android/junit/src/org/chromium/components/background_task_scheduler/TaskInfoTest.java

@@ -6,8 +6,6 @@ package org.chromium.components.background_task_scheduler;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Before;
@@ -31,42 +29,38 @@ public class TaskInfoTest {
     @Before
     public void setUp() {
         TestBackgroundTask.reset();
-        BackgroundTaskSchedulerFactory.setBackgroundTaskFactory(new TestBackgroundTaskFactory());
     }
 
-    private void checkGeneralTaskInfoFields(TaskInfo taskInfo, int taskId) {
+    private void checkGeneralTaskInfoFields(
+            TaskInfo taskInfo, int taskId, Class<? extends BackgroundTask> backgroundTaskClass) {
         assertEquals(taskId, taskInfo.getTaskId());
-        assertEquals(TestBackgroundTask.class, taskInfo.getBackgroundTaskClass());
+        assertEquals(backgroundTaskClass, taskInfo.getBackgroundTaskClass());
     }
 
     @Test
     @Feature({"BackgroundTaskScheduler"})
     public void testOneOffExpirationWithinDeadline() {
-        TaskInfo.TimingInfo timingInfo = TaskInfo.OneOffInfo.create()
-                                                 .setWindowEndTimeMs(TEST_END_MS)
-                                                 .setExpiresAfterWindowEndTime(true)
-                                                 .build();
-        TaskInfo oneOffTask = TaskInfo.createTask(TaskIds.TEST, timingInfo).build();
+        TaskInfo oneOffTask =
+                TaskInfo.createOneOffTask(TaskIds.TEST, TestBackgroundTask.class, TEST_END_MS)
+                        .setExpiresAfterWindowEndTime(true)
+                        .build();
 
-        checkGeneralTaskInfoFields(oneOffTask, TaskIds.TEST);
+        checkGeneralTaskInfoFields(oneOffTask, TaskIds.TEST, TestBackgroundTask.class);
 
         assertFalse(oneOffTask.getOneOffInfo().hasWindowStartTimeConstraint());
         assertEquals(TEST_END_MS, oneOffTask.getOneOffInfo().getWindowEndTimeMs());
         assertTrue(oneOffTask.getOneOffInfo().expiresAfterWindowEndTime());
 
-        assertNotNull(oneOffTask.getOneOffInfo());
-        assertNull(oneOffTask.getPeriodicInfo());
+        assertEquals(null, oneOffTask.getPeriodicInfo());
     }
 
     @Test
     @Feature({"BackgroundTaskScheduler"})
     public void testOneOffExpirationWithinTimeWindow() {
-        TaskInfo.TimingInfo timingInfo = TaskInfo.OneOffInfo.create()
-                                                 .setWindowStartTimeMs(TEST_START_MS)
-                                                 .setWindowEndTimeMs(TEST_END_MS)
-                                                 .setExpiresAfterWindowEndTime(true)
-                                                 .build();
-        TaskInfo oneOffTask = TaskInfo.createTask(TaskIds.TEST, timingInfo).build();
+        TaskInfo oneOffTask = TaskInfo.createOneOffTask(TaskIds.TEST, TestBackgroundTask.class,
+                                              TEST_START_MS, TEST_END_MS)
+                                      .setExpiresAfterWindowEndTime(true)
+                                      .build();
 
         assertTrue(oneOffTask.getOneOffInfo().hasWindowStartTimeConstraint());
         assertEquals(TEST_START_MS, oneOffTask.getOneOffInfo().getWindowStartTimeMs());
@@ -77,39 +71,25 @@ public class TaskInfoTest {
     @Test
     @Feature({"BackgroundTaskScheduler"})
     public void testOneOffExpirationWithinZeroTimeWindow() {
-        TaskInfo.TimingInfo timingInfo = TaskInfo.OneOffInfo.create()
-                                                 .setWindowStartTimeMs(TEST_END_MS)
-                                                 .setWindowEndTimeMs(TEST_END_MS)
-                                                 .setExpiresAfterWindowEndTime(true)
-                                                 .build();
-        TaskInfo oneOffTask = TaskInfo.createTask(TaskIds.TEST, timingInfo).build();
+        TaskInfo oneOffTask = TaskInfo.createOneOffTask(TaskIds.TEST, TestBackgroundTask.class,
+                                              TEST_END_MS, TEST_END_MS)
+                                      .setExpiresAfterWindowEndTime(true)
+                                      .build();
 
         assertEquals(TEST_END_MS, oneOffTask.getOneOffInfo().getWindowStartTimeMs());
         assertEquals(TEST_END_MS, oneOffTask.getOneOffInfo().getWindowEndTimeMs());
         assertTrue(oneOffTask.getOneOffInfo().expiresAfterWindowEndTime());
     }
 
-    @Test
-    @Feature({"BackgroundTaskScheduler"})
-    public void testOneOffNoParamsSet() {
-        TaskInfo.TimingInfo timingInfo = TaskInfo.OneOffInfo.create().build();
-        TaskInfo oneOffTask = TaskInfo.createTask(TaskIds.TEST, timingInfo).build();
-
-        assertFalse(oneOffTask.getOneOffInfo().hasWindowStartTimeConstraint());
-        assertEquals(0, oneOffTask.getOneOffInfo().getWindowEndTimeMs());
-        assertFalse(oneOffTask.getOneOffInfo().expiresAfterWindowEndTime());
-    }
-
     @Test
     @Feature({"BackgroundTaskScheduler"})
     public void testPeriodicExpirationWithInterval() {
-        TaskInfo.TimingInfo timingInfo = TaskInfo.PeriodicInfo.create()
-                                                 .setIntervalMs(TEST_END_MS)
-                                                 .setExpiresAfterWindowEndTime(true)
-                                                 .build();
-        TaskInfo periodicTask = TaskInfo.createTask(TaskIds.TEST, timingInfo).build();
+        TaskInfo periodicTask =
+                TaskInfo.createPeriodicTask(TaskIds.TEST, TestBackgroundTask.class, TEST_END_MS)
+                        .setExpiresAfterWindowEndTime(true)
+                        .build();
 
-        checkGeneralTaskInfoFields(periodicTask, TaskIds.TEST);
+        checkGeneralTaskInfoFields(periodicTask, TaskIds.TEST, TestBackgroundTask.class);
 
         assertFalse(periodicTask.getPeriodicInfo().hasFlex());
         assertEquals(TEST_END_MS, periodicTask.getPeriodicInfo().getIntervalMs());
@@ -121,27 +101,14 @@ public class TaskInfoTest {
     @Test
     @Feature({"BackgroundTaskScheduler"})
     public void testPeriodicExpirationWithIntervalAndFlex() {
-        TaskInfo.TimingInfo timingInfo = TaskInfo.PeriodicInfo.create()
-                                                 .setIntervalMs(TEST_END_MS)
-                                                 .setFlexMs(TEST_FLEX_MS)
-                                                 .setExpiresAfterWindowEndTime(true)
-                                                 .build();
-        TaskInfo periodicTask = TaskInfo.createTask(TaskIds.TEST, timingInfo).build();
+        TaskInfo periodicTask = TaskInfo.createPeriodicTask(TaskIds.TEST, TestBackgroundTask.class,
+                                                TEST_END_MS, TEST_FLEX_MS)
+                                        .setExpiresAfterWindowEndTime(true)
+                                        .build();
 
         assertTrue(periodicTask.getPeriodicInfo().hasFlex());
         assertEquals(TEST_FLEX_MS, periodicTask.getPeriodicInfo().getFlexMs());
         assertEquals(TEST_END_MS, periodicTask.getPeriodicInfo().getIntervalMs());
         assertTrue(periodicTask.getPeriodicInfo().expiresAfterWindowEndTime());
     }
-
-    @Test
-    @Feature({"BackgroundTaskScheduler"})
-    public void testPeriodicNoParamsSet() {
-        TaskInfo.TimingInfo timingInfo = TaskInfo.PeriodicInfo.create().build();
-        TaskInfo periodicTask = TaskInfo.createTask(TaskIds.TEST, timingInfo).build();
-
-        assertFalse(periodicTask.getPeriodicInfo().hasFlex());
-        assertEquals(0, periodicTask.getPeriodicInfo().getIntervalMs());
-        assertFalse(periodicTask.getPeriodicInfo().expiresAfterWindowEndTime());
-    }
 }
\ No newline at end of file