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 <[email protected]>
Reviewed-by: Peter Wen <[email protected]>
Reviewed-by: Tommy Nyquist <[email protected]>
Cr-Commit-Position: refs/heads/master@{#699995}
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index f502bdc..832adb4 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -2706,9 +2706,7 @@
"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",
diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
index 4abc02bbc..e862158 100644
--- a/chrome/android/chrome_java_sources.gni
+++ b/chrome/android/chrome_java_sources.gni
@@ -1724,11 +1724,9 @@
"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",
diff --git a/chrome/browser/android/chrome_context_util.cc b/chrome/browser/android/chrome_context_util.cc
index 035c139..f9d6713 100644
--- a/chrome/browser/android/chrome_context_util.cc
+++ b/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 {
diff --git a/chrome/browser/platform_util_android.cc b/chrome/browser/platform_util_android.cc
index 348c191..ddf3da4 100644
--- a/chrome/browser/platform_util_android.cc
+++ b/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"
diff --git a/chrome/browser/util/android/BUILD.gn b/chrome/browser/util/android/BUILD.gn
index 295b3b0..1fb0cfa 100644
--- a/chrome/browser/util/android/BUILD.gn
+++ b/chrome/browser/util/android/BUILD.gn
@@ -7,13 +7,15 @@
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 @@
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",
]
}
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/util/ChromeContextUtil.java b/chrome/browser/util/android/java/src/org/chromium/chrome/browser/util/ChromeContextUtil.java
similarity index 100%
rename from chrome/android/java/src/org/chromium/chrome/browser/util/ChromeContextUtil.java
rename to chrome/browser/util/android/java/src/org/chromium/chrome/browser/util/ChromeContextUtil.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/util/PlatformUtil.java b/chrome/browser/util/android/java/src/org/chromium/chrome/browser/util/PlatformUtil.java
similarity index 100%
rename from chrome/android/java/src/org/chromium/chrome/browser/util/PlatformUtil.java
rename to chrome/browser/util/android/java/src/org/chromium/chrome/browser/util/PlatformUtil.java
