Move PartnerBrowserCustomizationsUnitTest to unit_tests

In order to migrate java.net.URI to GURL the junit tests that rely on
java.net.URI need to be moved to a test apk that supports the native
library.

This change moves the PartnerBrowserCustomizationsUnitTest unittests
from junit to unit_tests (Android only). These tests should be just as
fast as they were as junit tests (and much faster than chrome_test_apk
unit tests).

Bug: 783819
Change-Id: I61fe3e37bbf4986b93e1a47d9ee348f19e97372e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1991736
Commit-Queue: Michael Thiessen <mthiesse@chromium.org>
Reviewed-by: Yaron Friedman <yfriedman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#730249}

chrome/android/BUILD.gn

@@ -2966,6 +2966,7 @@ android_library("native_java_unittests_java") {
     "native_java_unittests/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulatorTest.java",
     "native_java_unittests/src/org/chromium/chrome/browser/installedapp/InstalledAppProviderTest.java",
     "native_java_unittests/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridgeUnitTest.java",
+    "native_java_unittests/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizationsUnitTest.java",
   ]
 
   annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
@@ -2979,5 +2980,6 @@ generate_jni("native_j_unittests_jni_headers") {
     "native_java_unittests/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulatorTest.java",
     "native_java_unittests/src/org/chromium/chrome/browser/installedapp/InstalledAppProviderTest.java",
     "native_java_unittests/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridgeUnitTest.java",
+    "native_java_unittests/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizationsUnitTest.java",
   ]
 }

chrome/android/chrome_junit_test_java_sources.gni

@@ -165,7 +165,6 @@ chrome_junit_test_java_sources = [
   "junit/src/org/chromium/chrome/browser/omnibox/suggestions/entity/EntitySuggestionProcessorUnitTest.java",
   "junit/src/org/chromium/chrome/browser/page_info/PermissionParamsListBuilderUnitTest.java",
   "junit/src/org/chromium/chrome/browser/partnerbookmarks/PartnerBookmarksFaviconThrottleTest.java",
-  "junit/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizationsUnitTest.java",
   "junit/src/org/chromium/chrome/browser/payments/AndroidPaymentAppFinderUnitTest.java",
   "junit/src/org/chromium/chrome/browser/payments/AutofillContactTest.java",
   "junit/src/org/chromium/chrome/browser/payments/AutofillContactUnitTest.java",

chrome/android/junit/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizationsUnitTest.java → chrome/android/native_java_unittests/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizationsUnitTest.java

@@ -5,21 +5,20 @@
 package org.chromium.chrome.browser.partnercustomizations;
 
 import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
 
-import org.chromium.base.test.BaseRobolectricTestRunner;
+import org.chromium.base.annotations.CalledByNative;
+import org.chromium.base.annotations.CalledByNativeJavaTest;
 import org.chromium.base.test.util.Feature;
 
 /**
  * Unit tests for {@link PartnerBrowserCustomizations}.
  */
-@RunWith(BaseRobolectricTestRunner.class)
-@Config(manifest = Config.NONE)
 public class PartnerBrowserCustomizationsUnitTest {
-    @Test
+    @CalledByNative
+    private PartnerBrowserCustomizationsUnitTest() {}
+
     @Feature({"Homepage"})
+    @CalledByNativeJavaTest
     public void testIsValidHomepage() {
         Assert.assertTrue(PartnerBrowserCustomizations.isValidHomepage(
                 "chrome-native://newtab/path#fragment"));

chrome/browser/partnercustomizations/partner_browser_customizations_unittest.cc

+// 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.
+
+#include "base/android/jni_android.h"
+#include "chrome/android/native_j_unittests_jni_headers/PartnerBrowserCustomizationsUnitTest_jni.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+using base::android::AttachCurrentThread;
+
+class PartnerBrowserCustomizationsUnitTest : public ::testing::Test {
+ public:
+  PartnerBrowserCustomizationsUnitTest()
+      : j_test_(Java_PartnerBrowserCustomizationsUnitTest_Constructor(
+            AttachCurrentThread())) {}
+
+  const base::android::ScopedJavaGlobalRef<jobject>& j_test() {
+    return j_test_;
+  }
+
+ private:
+  base::android::ScopedJavaGlobalRef<jobject> j_test_;
+};
+
+JAVA_TESTS(PartnerBrowserCustomizationsUnitTest, j_test())

chrome/test/BUILD.gn

@@ -3779,6 +3779,7 @@ test("unit_tests") {
       "../browser/metrics/chrome_android_metrics_provider_unittest.cc",
       "../browser/notifications/notification_platform_bridge_android_unittest.cc",
       "../browser/page_load_metrics/observers/android_page_load_metrics_observer_unittest.cc",
+      "../browser/partnercustomizations/partner_browser_customizations_unittest.cc",
       "../browser/password_manager/account_chooser_dialog_android_unittest.cc",
       "../browser/password_manager/auto_signin_first_run_dialog_android_unittest.cc",
       "../browser/password_manager/credential_leak_controller_android_unittest.cc",