Move chrome/android utils Java tests to chrome/browser.

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

chrome/android/BUILD.gn

@@ -2057,6 +2057,7 @@ chrome_test_apk_tmpl("chrome_public_test_apk") {
     "//chrome/browser/subresource_filter:subresource_filter_javatests",
     "//chrome/browser/touch_to_fill/android:test_java",
     "//chrome/browser/ui/android/widget:ui_widget_java_tests",
+    "//chrome/browser/util:javatests",
   ]
 
   data_deps = [

chrome/android/chrome_test_java_sources.gni

@@ -171,6 +171,7 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/firstrun/FirstRunActivityTestObserver.java",
   "javatests/src/org/chromium/chrome/browser/firstrun/FirstRunIntegrationTest.java",
   "javatests/src/org/chromium/chrome/browser/firstrun/FirstRunUtilsTest.java",
+  "javatests/src/org/chromium/chrome/browser/flags/FeatureUtilitiesTest.java",
   "javatests/src/org/chromium/chrome/browser/fullscreen/FullscreenManagerTest.java",
   "javatests/src/org/chromium/chrome/browser/fullscreen/FullscreenManagerTestUtils.java",
   "javatests/src/org/chromium/chrome/browser/gcore/MockConnectedTask.java",
@@ -488,10 +489,6 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/translate/TranslateCompactInfoBarTest.java",
   "javatests/src/org/chromium/chrome/browser/translate/TranslateOptionsTest.java",
   "javatests/src/org/chromium/chrome/browser/usage_stats/TabSuspensionTest.java",
-  "javatests/src/org/chromium/chrome/browser/util/ChromeFileProviderTest.java",
-  "javatests/src/org/chromium/chrome/browser/util/FeatureUtilitiesTest.java",
-  "javatests/src/org/chromium/chrome/browser/util/HashUtilTest.java",
-  "javatests/src/org/chromium/chrome/browser/util/UrlUtilitiesTest.java",
   "javatests/src/org/chromium/chrome/browser/video/FullscreenVideoTest.java",
   "javatests/src/org/chromium/chrome/browser/video/VideoTest.java",
   "javatests/src/org/chromium/chrome/browser/webapps/ActivityAssignerTest.java",

chrome/android/javatests/src/org/chromium/chrome/browser/util/FeatureUtilitiesTest.java → chrome/android/javatests/src/org/chromium/chrome/browser/flags/FeatureUtilitiesTest.java

@@ -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.util;
+package org.chromium.chrome.browser.flags;
 
 import android.content.Intent;
 import android.content.pm.ResolveInfo;
@@ -19,7 +19,6 @@ import org.junit.runner.RunWith;
 import org.chromium.base.ContextUtils;
 import org.chromium.base.test.util.AdvancedMockContext;
 import org.chromium.base.test.util.Feature;
-import org.chromium.chrome.browser.flags.FeatureUtilities;
 import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
 import org.chromium.components.signin.AccountManagerFacade;
 import org.chromium.content_public.browser.test.util.TestThreadUtils;

chrome/browser/util/BUILD.gn

@@ -41,3 +41,21 @@ generate_jni("jni_headers") {
     "android/java/src/org/chromium/chrome/browser/util/UrlUtilities.java",
   ]
 }
+
+android_library("javatests") {
+  testonly = true
+  java_files = [
+    "android/java/src/org/chromium/chrome/browser/util/ChromeFileProviderTest.java",
+    "android/java/src/org/chromium/chrome/browser/util/HashUtilTest.java",
+    "android/java/src/org/chromium/chrome/browser/util/UrlUtilitiesTest.java",
+  ]
+  deps = [
+    ":java",
+    "//base:base_java",
+    "//base/test:test_support_java",
+    "//chrome/test/android:chrome_java_test_support",
+    "//content/public/test/android:content_java_test_support",
+    "//third_party/junit",
+    "//third_party/mockito:mockito_java",
+  ]
+}

chrome/android/javatests/src/org/chromium/chrome/browser/util/UrlUtilitiesTest.java → chrome/browser/util/android/java/src/org/chromium/chrome/browser/util/UrlUtilitiesTest.java

@@ -4,6 +4,7 @@
 
 package org.chromium.chrome.browser.util;
 
+import android.annotation.SuppressLint;
 import android.support.test.filters.SmallTest;
 
 import org.junit.Assert;
@@ -16,6 +17,7 @@ import org.chromium.base.test.BaseJUnit4ClassRunner;
 import org.chromium.content_public.browser.test.NativeLibraryTestRule;
 
 /** Tests for functions in {@link UrlUtilities} that use native code. */
+@SuppressLint("Authleak")
 @RunWith(BaseJUnit4ClassRunner.class)
 public class UrlUtilitiesTest {
     @Rule