Move ChromeContextUtil and PlatformUtil to chrome/browser/util.

These are simple files to move so doing both in the same CL.

Bug: 995916
Change-Id: I67b61f9d3ffea0f66bd493f350f069affea708e1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1812117
Commit-Queue: Henrique Nakashima <hnakashima@chromium.org>
Reviewed-by: Peter Wen <wnwen@chromium.org>
Reviewed-by: Tommy Nyquist <nyquist@chromium.org>
Cr-Commit-Position: refs/heads/master@{#699995}

chrome/android/BUILD.gn

@@ -2706,9 +2706,7 @@ generate_jni("chrome_jni_headers") {
     "java/src/org/chromium/chrome/browser/translate/TranslateBridge.java",
     "java/src/org/chromium/chrome/browser/usage_stats/NotificationSuspender.java",
     "java/src/org/chromium/chrome/browser/usage_stats/UsageStatsBridge.java",
-    "java/src/org/chromium/chrome/browser/util/ChromeContextUtil.java",
     "java/src/org/chromium/chrome/browser/util/FeatureUtilities.java",
-    "java/src/org/chromium/chrome/browser/util/PlatformUtil.java",
     "java/src/org/chromium/chrome/browser/webapps/WebApkHandlerDelegate.java",
     "java/src/org/chromium/chrome/browser/webapps/WebApkInstallService.java",
     "java/src/org/chromium/chrome/browser/webapps/WebApkInstaller.java",

chrome/android/chrome_java_sources.gni

@@ -1724,11 +1724,9 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/ui/tablet/emptybackground/incognitotoggle/IncognitoToggleButton.java",
   "java/src/org/chromium/chrome/browser/ui/tablet/emptybackground/incognitotoggle/IncognitoToggleButtonTablet.java",
   "java/src/org/chromium/chrome/browser/util/AccessibilityUtil.java",
-  "java/src/org/chromium/chrome/browser/util/ChromeContextUtil.java",
   "java/src/org/chromium/chrome/browser/util/ChromeIntentUtil.java",
   "java/src/org/chromium/chrome/browser/util/ColorUtils.java",
   "java/src/org/chromium/chrome/browser/util/FeatureUtilities.java",
-  "java/src/org/chromium/chrome/browser/util/PlatformUtil.java",
   "java/src/org/chromium/chrome/browser/util/ViewUtils.java",
   "java/src/org/chromium/chrome/browser/vr/ArDelegate.java",
   "java/src/org/chromium/chrome/browser/vr/ArDelegateProvider.java",

chrome/browser/android/chrome_context_util.cc

@@ -5,7 +5,7 @@
 #include "chrome/browser/android/chrome_context_util.h"
 
 #include "base/android/jni_android.h"
-#include "chrome/android/chrome_jni_headers/ChromeContextUtil_jni.h"
+#include "chrome/browser/util/android/jni_headers/ChromeContextUtil_jni.h"
 
 namespace chrome {
 namespace android {

chrome/browser/platform_util_android.cc

@@ -7,8 +7,8 @@
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/logging.h"
-#include "chrome/android/chrome_jni_headers/PlatformUtil_jni.h"
 #include "chrome/browser/platform_util.h"
+#include "chrome/browser/util/android/jni_headers/PlatformUtil_jni.h"
 #include "ui/android/view_android.h"
 #include "url/gurl.h"
 

chrome/browser/util/android/BUILD.gn

@@ -7,13 +7,15 @@ import("//build/config/android/rules.gni")
 android_library("java") {
   java_files = [
     "java/src/org/chromium/chrome/browser/util/BitmapCache.java",
+    "java/src/org/chromium/chrome/browser/util/ChromeContextUtil.java",
+    "java/src/org/chromium/chrome/browser/util/ChromeFileProvider.java",
     "java/src/org/chromium/chrome/browser/util/ConversionUtils.java",
     "java/src/org/chromium/chrome/browser/util/FileSizeUtil.java",
     "java/src/org/chromium/chrome/browser/util/HashUtil.java",
     "java/src/org/chromium/chrome/browser/util/IntentUtils.java",
     "java/src/org/chromium/chrome/browser/util/KeyNavigationUtil.java",
     "java/src/org/chromium/chrome/browser/util/MathUtils.java",
-    "java/src/org/chromium/chrome/browser/util/ChromeFileProvider.java",
+    "java/src/org/chromium/chrome/browser/util/PlatformUtil.java",
     "java/src/org/chromium/chrome/browser/util/UrlConstants.java",
     "java/src/org/chromium/chrome/browser/util/UrlUtilities.java",
   ]
@@ -30,6 +32,8 @@ android_library("java") {
 
 generate_jni("jni_headers") {
   sources = [
+    "java/src/org/chromium/chrome/browser/util/ChromeContextUtil.java",
+    "java/src/org/chromium/chrome/browser/util/PlatformUtil.java",
     "java/src/org/chromium/chrome/browser/util/UrlUtilities.java",
   ]
 }