Move CachedFeatureFlags to chrome/browser/flags.

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

chrome/android/BUILD.gn

@@ -2692,7 +2692,6 @@ generate_jni("chrome_jni_headers") {
     "java/src/org/chromium/chrome/browser/feedback/ScreenshotTask.java",
     "java/src/org/chromium/chrome/browser/feedback/SystemInfoFeedbackSource.java",
     "java/src/org/chromium/chrome/browser/firstrun/FirstRunUtils.java",
-    "java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java",
     "java/src/org/chromium/chrome/browser/flags/ChromeSessionState.java",
     "java/src/org/chromium/chrome/browser/gesturenav/CompositorNavigationGlow.java",
     "java/src/org/chromium/chrome/browser/history/BrowsingHistoryBridge.java",

chrome/android/chrome_java_sources.gni

@@ -745,7 +745,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/firstrun/TabbedModeFirstRunActivity.java",
   "java/src/org/chromium/chrome/browser/firstrun/ToSAckedReceiver.java",
   "java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java",
-  "java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java",
   "java/src/org/chromium/chrome/browser/flags/ChromeSessionState.java",
   "java/src/org/chromium/chrome/browser/fullscreen/BrowserStateBrowserControlsVisibilityDelegate.java",
   "java/src/org/chromium/chrome/browser/fullscreen/ChromeFullscreenManager.java",

chrome/android/chrome_junit_test_java_sources.gni

@@ -77,8 +77,6 @@ chrome_junit_test_java_sources = [
   "junit/src/org/chromium/chrome/browser/firstrun/FirstRunFlowSequencerTest.java",
   "junit/src/org/chromium/chrome/browser/firstrun/FirstRunIntegrationUnitTest.java",
   "junit/src/org/chromium/chrome/browser/firstrun/ToSAckedReceiverTest.java",
-  "junit/src/org/chromium/chrome/browser/flags/CachedFeatureFlagsAnnotationUnitTest.java",
-  "junit/src/org/chromium/chrome/browser/flags/CachedFeatureFlagsUnitTest.java",
   "junit/src/org/chromium/chrome/browser/fullscreen/BrowserStateBrowserControlsVisibilityDelegateTest.java",
   "junit/src/org/chromium/chrome/browser/gcore/GoogleApiClientHelperTest.java",
   "junit/src/org/chromium/chrome/browser/gsa/GSAStateUnitTest.java",

chrome/browser/BUILD.gn

@@ -2346,8 +2346,6 @@ jumbo_static_library("browser") {
       "android/browsing_data/browsing_data_counter_bridge.h",
       "android/browsing_data/url_filter_bridge.cc",
       "android/browsing_data/url_filter_bridge.h",
-      "android/cached_feature_flags.cc",
-      "android/cached_feature_flags.h",
       "android/chrome_backup_agent.cc",
       "android/chrome_backup_agent.h",
       "android/chrome_backup_watcher.cc",
@@ -2984,6 +2982,7 @@ jumbo_static_library("browser") {
       "//chrome/android/modules/extra_icu/provider:native",
       "//chrome/browser/android/thin_webview/internal",
       "//chrome/browser/android/webapk:proto",
+      "//chrome/browser/flags:flags_android",
       "//chrome/browser/nfc/android:native",
       "//chrome/browser/notifications/chime/android",
       "//chrome/browser/notifications/scheduler/public",

chrome/browser/android/tab_web_contents_delegate_android.cc

@@ -19,12 +19,12 @@
 #include "base/optional.h"
 #include "base/rand_util.h"
 #include "chrome/android/chrome_jni_headers/TabWebContentsDelegateAndroid_jni.h"
-#include "chrome/browser/android/cached_feature_flags.h"
 #include "chrome/browser/android/hung_renderer_infobar_delegate.h"
 #include "chrome/browser/android/tab_android.h"
 #include "chrome/browser/banners/app_banner_manager_android.h"
 #include "chrome/browser/content_settings/sound_content_setting_observer.h"
 #include "chrome/browser/file_select_helper.h"
+#include "chrome/browser/flags/android/cached_feature_flags.h"
 #include "chrome/browser/flags/android/chrome_feature_list.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/media/protected_media_identifier_permission_context.h"

chrome/browser/chrome_browser_field_trials.cc

@@ -26,8 +26,8 @@
 #include "components/version_info/version_info.h"
 
 #if defined(OS_ANDROID)
-#include "chrome/browser/android/cached_feature_flags.h"
 #include "chrome/browser/chrome_browser_field_trials_mobile.h"
+#include "chrome/browser/flags/android/cached_feature_flags.h"
 #else
 #include "chrome/browser/chrome_browser_field_trials_desktop.h"
 #endif

chrome/browser/download/android/download_manager_service.cc

@@ -18,7 +18,6 @@
 #include "base/time/time.h"
 #include "chrome/android/chrome_jni_headers/DownloadItem_jni.h"
 #include "chrome/android/chrome_jni_headers/DownloadManagerService_jni.h"
-#include "chrome/browser/android/cached_feature_flags.h"
 #include "chrome/browser/android/profile_key_startup_accessor.h"
 #include "chrome/browser/download/android/download_controller.h"
 #include "chrome/browser/download/android/download_startup_utils.h"
@@ -27,6 +26,7 @@
 #include "chrome/browser/download/android/service/download_task_scheduler.h"
 #include "chrome/browser/download/offline_item_utils.h"
 #include "chrome/browser/download/simple_download_manager_coordinator_factory.h"
+#include "chrome/browser/flags/android/cached_feature_flags.h"
 #include "chrome/browser/flags/android/chrome_feature_list.h"
 #include "chrome/browser/profiles/profile_key.h"
 #include "chrome/browser/profiles/profile_manager.h"

chrome/browser/flags/BUILD.gn

@@ -7,6 +7,7 @@ import("//build/config/android/rules.gni")
 android_library("java") {
   sources = [
     "android/java/src/org/chromium/chrome/browser/flags/BooleanCachedFieldTrialParameter.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/IntCachedFieldTrialParameter.java",
@@ -23,10 +24,22 @@ android_library("java") {
 
 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",
   ]
 }
 
+static_library("flags_android") {
+  sources = [
+    "android/cached_feature_flags.cc",
+    "android/cached_feature_flags.h",
+  ]
+  deps = [
+    "//base",
+    "//content/public/common",
+  ]
+}
+
 java_cpp_strings("chrome_android_java_switches_srcjar") {
   sources = [ "//chrome/common/chrome_switches.cc" ]
   template = "android/java_templates/ChromeSwitches.java.tmpl"
@@ -37,6 +50,8 @@ java_library("flags_junit_tests") {
   bypass_platform_checks = true
   testonly = true
   sources = [
+    "android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlagsAnnotationUnitTest.java",
+    "android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlagsUnitTest.java",
     "android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureListWithProcessorUnitTest.java",
     "android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureListWithoutProcessorUnitTest.java",
   ]

chrome/browser/android/cached_feature_flags.cc → chrome/browser/flags/android/cached_feature_flags.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/cached_feature_flags.h"
+#include "chrome/browser/flags/android/cached_feature_flags.h"
 
-#include "chrome/android/chrome_jni_headers/CachedFeatureFlags_jni.h"
+#include "chrome/browser/flags/jni_headers/CachedFeatureFlags_jni.h"
 
 #include "base/android/jni_string.h"
 #include "base/feature_list.h"

chrome/browser/android/cached_feature_flags.h → chrome/browser/flags/android/cached_feature_flags.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_CACHED_FEATURE_FLAGS_H_
-#define CHROME_BROWSER_ANDROID_CACHED_FEATURE_FLAGS_H_
+#ifndef CHROME_BROWSER_FLAGS_ANDROID_CACHED_FEATURE_FLAGS_H_
+#define CHROME_BROWSER_FLAGS_ANDROID_CACHED_FEATURE_FLAGS_H_
 
 #include <jni.h>
 
@@ -25,4 +25,4 @@ std::string GetReachedCodeProfilerTrialGroup();
 }  // namespace android
 }  // namespace chrome
 
-#endif  // CHROME_BROWSER_ANDROID_CACHED_FEATURE_FLAGS_H_
+#endif  // CHROME_BROWSER_FLAGS_ANDROID_CACHED_FEATURE_FLAGS_H_

chrome/browser/search_provider_logos/logo_service_factory.cc

@@ -17,10 +17,6 @@
 #include "content/public/browser/storage_partition.h"
 #include "services/network/public/cpp/shared_url_loader_factory.h"
 
-#if defined(OS_ANDROID)
-#include "chrome/browser/android/cached_feature_flags.h"
-#endif
-
 using search_provider_logos::LogoService;
 using search_provider_logos::LogoServiceImpl;