Move ChromeSessionState to flags module

This is the last class in the flags package in chrome_java.

I considered moving it to a new metrics module, but the enums like
ActivityType are core and used in a lot of places, and have meaning
besides metrics, so I'm keeping these in flags and simply
modularizing to unblock any code that uses them.

Change-Id: I57c6accfaa2f1a18e230af2219b5e883919af49b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2625890Reviewed-by: Theresa  <twellington@chromium.org>
Commit-Queue: Henrique Nakashima <hnakashima@chromium.org>
Cr-Commit-Position: refs/heads/master@{#843695}

chrome/android/BUILD.gn

@@ -705,7 +705,6 @@ python2_action("chrome_android_java_google_api_keys_srcjar") {
 
 java_cpp_enum("chrome_android_java_enums_srcjar") {
   sources = [
-    "//chrome/browser/android/chrome_session_state.h",
     "//chrome/browser/android/customtabs/detached_resource_request.h",
     "//chrome/browser/android/explore_sites/explore_sites_bridge.h",
     "//chrome/browser/android/explore_sites/explore_sites_feature.h",
@@ -3317,7 +3316,6 @@ generate_jni("chrome_jni_headers") {
     "java/src/org/chromium/chrome/browser/feedback/ConnectivityChecker.java",
     "java/src/org/chromium/chrome/browser/feedback/ScreenshotTask.java",
     "java/src/org/chromium/chrome/browser/firstrun/FirstRunUtils.java",
-    "java/src/org/chromium/chrome/browser/flags/ChromeSessionState.java",
     "java/src/org/chromium/chrome/browser/gesturenav/OverscrollSceneLayer.java",
     "java/src/org/chromium/chrome/browser/history/BrowsingHistoryBridge.java",
     "java/src/org/chromium/chrome/browser/history/HistoryDeletionBridge.java",

chrome/android/chrome_java_sources.gni

@@ -621,7 +621,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/firstrun/TosAndUmaFirstRunFragmentWithEnterpriseSupport.java",
   "java/src/org/chromium/chrome/browser/firstrun/TosAndUmaFragmentView.java",
   "java/src/org/chromium/chrome/browser/firstrun/TosDialogBehaviorSharedPrefInvalidator.java",
-  "java/src/org/chromium/chrome/browser/flags/ChromeSessionState.java",
   "java/src/org/chromium/chrome/browser/fullscreen/BrowserControlsManager.java",
   "java/src/org/chromium/chrome/browser/fullscreen/FullscreenHtmlApiHandler.java",
   "java/src/org/chromium/chrome/browser/gcore/ChromeGoogleApiClient.java",

chrome/android/java/src/org/chromium/chrome/browser/flags/DIR_METADATA

-monorail {
-  component: "UI>Browser>Mobile"
-}
-team_email: "clank-modularization@chromium.org"
-os: ANDROID

chrome/android/java/src/org/chromium/chrome/browser/flags/OWNERS

-file://chrome/browser/flags/OWNERS

chrome/browser/BUILD.gn

@@ -2558,8 +2558,6 @@ static_library("browser") {
       "android/chrome_backup_agent.h",
       "android/chrome_backup_watcher.cc",
       "android/chrome_backup_watcher.h",
-      "android/chrome_session_state.cc",
-      "android/chrome_session_state.h",
       "android/chrome_startup_flags.cc",
       "android/chrome_startup_flags.h",
       "android/component_updater/background_task_update_scheduler.cc",

chrome/browser/flags/BUILD.gn

@@ -10,6 +10,7 @@ android_library("java") {
     "android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java",
     "android/java/src/org/chromium/chrome/browser/flags/CachedFieldTrialParameter.java",
     "android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java",
+    "android/java/src/org/chromium/chrome/browser/flags/ChromeSessionState.java",
     "android/java/src/org/chromium/chrome/browser/flags/DoubleCachedFieldTrialParameter.java",
     "android/java/src/org/chromium/chrome/browser/flags/FeatureParamUtils.java",
     "android/java/src/org/chromium/chrome/browser/flags/IntCachedFieldTrialParameter.java",
@@ -22,7 +23,10 @@ android_library("java") {
     "//chrome/browser/preferences:java",
     "//third_party/android_deps:androidx_annotation_annotation_java",
   ]
-  srcjar_deps = [ ":chrome_android_java_switches_srcjar" ]
+  srcjar_deps = [
+    ":chrome_android_java_switches_srcjar",
+    ":chrome_browser_flags_enums_srcjar",
+  ]
   annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
 }
 
@@ -30,6 +34,7 @@ generate_jni("jni_headers") {
   sources = [
     "android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java",
     "android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java",
+    "android/java/src/org/chromium/chrome/browser/flags/ChromeSessionState.java",
   ]
 }
 
@@ -37,6 +42,8 @@ static_library("flags_android") {
   sources = [
     "android/cached_feature_flags.cc",
     "android/cached_feature_flags.h",
+    "android/chrome_session_state.cc",
+    "android/chrome_session_state.h",
   ]
   deps = [
     ":jni_headers",
@@ -50,6 +57,10 @@ java_cpp_strings("chrome_android_java_switches_srcjar") {
   template = "android/java_templates/ChromeSwitches.java.tmpl"
 }
 
+java_cpp_enum("chrome_browser_flags_enums_srcjar") {
+  sources = [ "android/chrome_session_state.h" ]
+}
+
 java_library("flags_junit_tests") {
   # Skip platform checks since Robolectric depends on requires_android targets.
   bypass_platform_checks = true

chrome/browser/android/chrome_session_state.cc → chrome/browser/flags/android/chrome_session_state.cc

@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/android/chrome_session_state.h"
+#include "chrome/browser/flags/android/chrome_session_state.h"
 
-#include "chrome/android/chrome_jni_headers/ChromeSessionState_jni.h"
+#include "chrome/browser/flags/jni_headers/ChromeSessionState_jni.h"
 
 #include "services/metrics/public/cpp/ukm_source.h"
 

chrome/browser/android/chrome_session_state.h → chrome/browser/flags/android/chrome_session_state.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_ANDROID_CHROME_SESSION_STATE_H_
-#define CHROME_BROWSER_ANDROID_CHROME_SESSION_STATE_H_
+#ifndef CHROME_BROWSER_FLAGS_ANDROID_CHROME_SESSION_STATE_H_
+#define CHROME_BROWSER_FLAGS_ANDROID_CHROME_SESSION_STATE_H_
 
 #include <jni.h>
 
@@ -35,4 +35,4 @@ bool GetIsInMultiWindowModeValue();
 }  // namespace android
 }  // namespace chrome
 
-#endif  // CHROME_BROWSER_ANDROID_CHROME_SESSION_STATE_H_
+#endif  // CHROME_BROWSER_FLAGS_ANDROID_CHROME_SESSION_STATE_H_

chrome/browser/metrics/chrome_android_metrics_provider.cc

@@ -6,9 +6,9 @@
 
 #include "base/metrics/histogram_macros.h"
 #include "chrome/android/chrome_jni_headers/NotificationSystemStatusUtil_jni.h"
-#include "chrome/browser/android/chrome_session_state.h"
 #include "chrome/browser/android/locale/locale_manager.h"
 #include "chrome/browser/android/metrics/uma_session_stats.h"
+#include "chrome/browser/flags/android/chrome_session_state.h"
 
 namespace {