Move ChromeSwitches to .flags package and to chrome/browser/flags.

Only one arbitrary usage is migrated. Other usages will be migrated in
follow up CLs, then the temporary class still in chrome.browser package
will be removed.

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

chrome/android/BUILD.gn

@@ -220,7 +220,6 @@ android_library("chrome_public_java") {
 
 android_library("chrome_java") {
   deps = [
-    ":chrome_android_java_switches",
     ":chrome_app_java_resources",
     ":chrome_public_android_manifest",
     ":chrome_public_apk_template_resources",
@@ -609,13 +608,9 @@ java_cpp_enum("sync_user_settings_enums_java") {
   sources = [ "//components/sync/driver/sync_user_settings.h" ]
 }
 
-java_cpp_strings("chrome_android_java_switches_srcjar") {
-  sources = [ "//chrome/common/chrome_switches.cc" ]
-  template = "//chrome/android/java_templates/ChromeSwitches.java.tmpl"
-}
-
-android_library("chrome_android_java_switches") {
-  srcjar_deps = [ ":chrome_android_java_switches_srcjar" ]
+# TODO(crbug.com/1041473): Remove this when all usages are migrated.
+java_group("chrome_android_java_switches") {
+  deps = [ "//chrome/browser/flags:java" ]
 }
 
 proto_java_library("partner_location_descriptor_proto_java") {
@@ -767,7 +762,6 @@ android_library("chrome_test_java") {
 
   deps = [
     ":browser_java_test_support",
-    ":chrome_android_java_switches",
     ":chrome_app_java_resources",
     ":chrome_test_util_java",
     ":partner_location_descriptor_proto_java",

chrome/android/chrome_java_sources.gni

@@ -26,6 +26,7 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/ChromeLocalizationUtils.java",
   "java/src/org/chromium/chrome/browser/ChromeStrictMode.java",
   "java/src/org/chromium/chrome/browser/ChromeStringConstants.java",
+  "java/src/org/chromium/chrome/browser/ChromeSwitches.java",
   "java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java",
   "java/src/org/chromium/chrome/browser/ChromeTabbedActivity2.java",
   "java/src/org/chromium/chrome/browser/ChromeVersionInfo.java",

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

+// Copyright 2020 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;
+
+/**
+ * TODO(crbug.com/1041473): New location for ChromeSwitches. Temporary class to migrate usages
+ * before the actual class.
+ */
+public class ChromeSwitches extends org.chromium.chrome.browser.flags.ChromeSwitches {}

chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java

@@ -31,10 +31,10 @@ import org.chromium.chrome.browser.AppHooks;
 import org.chromium.chrome.browser.ChromeCachedFlags;
 import org.chromium.chrome.browser.ChromeLocalizationUtils;
 import org.chromium.chrome.browser.ChromeStrictMode;
-import org.chromium.chrome.browser.ChromeSwitches;
 import org.chromium.chrome.browser.FileProviderHelper;
 import org.chromium.chrome.browser.crash.LogcatExtractionRunnable;
 import org.chromium.chrome.browser.download.DownloadManagerService;
+import org.chromium.chrome.browser.flags.ChromeSwitches;
 import org.chromium.chrome.browser.services.GoogleServicesManager;
 import org.chromium.chrome.browser.webapps.ActivityAssigner;
 import org.chromium.chrome.browser.webapps.ChromeWebApkHost;

chrome/browser/flags/BUILD.gn

@@ -17,6 +17,7 @@ android_library("java") {
     "//base:jni_java",
     "//chrome/browser/preferences:java",
   ]
+  srcjar_deps = [ ":chrome_android_java_switches_srcjar" ]
   annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
 }
 
@@ -26,6 +27,11 @@ generate_jni("jni_headers") {
   ]
 }
 
+java_cpp_strings("chrome_android_java_switches_srcjar") {
+  sources = [ "//chrome/common/chrome_switches.cc" ]
+  template = "android/java_templates/ChromeSwitches.java.tmpl"
+}
+
 java_library("flags_junit_tests") {
   # Skip platform checks since Robolectric depends on requires_android targets.
   bypass_platform_checks = true

chrome/android/java_templates/ChromeSwitches.java.tmpl → chrome/browser/flags/android/java_templates/ChromeSwitches.java.tmpl

@@ -2,7 +2,7 @@
 // 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;
+package org.chromium.chrome.browser.flags;
 
 /**
  * Contains all of the command line switches that are specific to the chrome/
@@ -188,5 +188,5 @@ public abstract class ChromeSwitches {{
 {NATIVE_STRINGS}
 
     // Prevent instantiation.
-    private ChromeSwitches() {{}}
+    protected ChromeSwitches() {{}}
 }}

chrome/browser/thumbnail/generator/BUILD.gn

@@ -96,7 +96,7 @@ if (is_android) {
       ":java",
       "//base:base_java",
       "//base:base_java_test_support",
-      "//chrome/android:chrome_android_java_switches",
+      "//chrome/browser/flags:java",
       "//chrome/browser/util:java",
       "//chrome/test/android:chrome_java_test_support",
       "//content/public/android:content_java",