Notification Scheduler: move SchedulerTaskTime to public and make the Java counterpart

Bug: 966969
Change-Id: I1178622066411bad23e14386511583fabe8971d2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1629015
Commit-Queue: Hesen Zhang <hesen@chromium.org>
Reviewed-by: David Trainor <dtrainor@chromium.org>
Reviewed-by: Xing Liu <xingliu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#664006}

chrome/android/BUILD.gn

@@ -422,6 +422,7 @@ android_library("chrome_java") {
     "//components/signin/core/browser:signin_enums_javagen",
     "//components/supervised_user_error_page:enums_srcjar",
     "//components/ui_metrics:ui_metrics_enums_java",
+    "//chrome/browser/notifications/scheduler:jni_enums",
     "//chrome/browser/ui:tab_model_enums_java",
     "//net:effective_connection_type_java",
     ":vr_build_config",

chrome/browser/notifications/scheduler/BUILD.gn

@@ -20,7 +20,6 @@ group("scheduler") {
 
 source_set("public") {
   sources = [
-    "internal_types.h",
     "notification_background_task_scheduler.h",
     "notification_data.cc",
     "notification_data.h",
@@ -86,7 +85,6 @@ source_set("lib") {
     "impression_types.h",
     "init_aware_scheduler.cc",
     "init_aware_scheduler.h",
-    "internal_types.h",
     "notification_entry.cc",
     "notification_entry.h",
     "notification_schedule_service_impl.cc",
@@ -143,3 +141,11 @@ source_set("unit_tests") {
     "//testing/gtest",
   ]
 }
+
+if (is_android) {
+  java_cpp_enum("jni_enums") {
+    sources = [
+      "notification_scheduler_types.h",
+    ]
+  }
+}

chrome/browser/notifications/scheduler/DEPS

+include_rules = [
+  "+jni",
+]

chrome/browser/notifications/scheduler/background_task_coordinator.h

@@ -10,7 +10,6 @@
 #include <vector>
 
 #include "base/macros.h"
-#include "chrome/browser/notifications/scheduler/internal_types.h"
 #include "chrome/browser/notifications/scheduler/notification_scheduler_types.h"
 
 namespace base {

chrome/browser/notifications/scheduler/display_decider.h

@@ -13,7 +13,6 @@
 
 #include "base/callback.h"
 #include "base/macros.h"
-#include "chrome/browser/notifications/scheduler/internal_types.h"
 #include "chrome/browser/notifications/scheduler/notification_scheduler_types.h"
 
 namespace notifications {

chrome/browser/notifications/scheduler/distribution_policy.h

@@ -8,7 +8,7 @@
 #include <memory>
 
 #include "base/macros.h"
-#include "chrome/browser/notifications/scheduler/internal_types.h"
+#include "chrome/browser/notifications/scheduler/notification_scheduler_types.h"
 
 namespace notifications {
 

chrome/browser/notifications/scheduler/impression_types.h

@@ -11,7 +11,6 @@
 
 #include "base/optional.h"
 #include "base/time/time.h"
-#include "chrome/browser/notifications/scheduler/internal_types.h"
 #include "chrome/browser/notifications/scheduler/notification_scheduler_types.h"
 
 namespace notifications {

chrome/browser/notifications/scheduler/internal_types.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_NOTIFICATIONS_SCHEDULER_INTERNAL_TYPES_H_
-#define CHROME_BROWSER_NOTIFICATIONS_SCHEDULER_INTERNAL_TYPES_H_
-
-namespace notifications {
-
-// Enum to describe the time to process scheduled notification data.
-enum class SchedulerTaskTime {
-  // The system is started from normal user launch or other background
-  // tasks.
-  kUnknown = 0,
-
-  // Background task runs in the morning.
-  kMorning = 1,
-
-  // Background task runs in the evening.
-  kEvening = 2,
-};
-
-}  // namespace notifications
-
-#endif  // CHROME_BROWSER_NOTIFICATIONS_SCHEDULER_INTERNAL_TYPES_H_

chrome/browser/notifications/scheduler/notification_background_task_scheduler.h

@@ -7,7 +7,7 @@
 
 #include "base/macros.h"
 #include "base/time/time.h"
-#include "chrome/browser/notifications/scheduler/internal_types.h"
+#include "chrome/browser/notifications/scheduler/notification_scheduler_types.h"
 
 namespace notifications {
 

chrome/browser/notifications/scheduler/notification_scheduler_types.h

@@ -7,6 +7,20 @@
 
 namespace notifications {
 
+// Enum to describe the time to process scheduled notification data.
+// A Java counterpart will be generated for this enum.
+// GENERATED_JAVA_ENUM_PACKAGE: (
+//   org.chromium.chrome.browser.notifications.scheduler)
+enum class SchedulerTaskTime {
+  // The system is started from normal user launch or other background
+  // tasks.
+  kUnknown = 0,
+  // Background task runs in the morning.
+  kMorning = 1,
+  // Background task runs in the evening.
+  kEvening = 2,
+};
+
 // The type of a list of clients using the notification scheduler system.
 enum class SchedulerClientType {
   // Test only values.