Modularize java side of SiteEngagementService.

C++ needs more if we're split from :browser target.
Doing a clean-up of OWNERS and this seemed fairly straightforward.

Also adjust chrome/browser/DEPS to be lenient to any java test.

Change-Id: Ib3c58ab814c3a2df5e348f924438dcd4aed35ba8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2285342
Commit-Queue: Yaron Friedman <yfriedman@chromium.org>
Reviewed-by: Dominick Ng <dominickn@chromium.org>
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Cr-Commit-Position: refs/heads/master@{#786394}

chrome/android/BUILD.gn

@@ -308,6 +308,7 @@ android_library("chrome_java") {
     "//chrome/browser/download/android:factory_java",
     "//chrome/browser/download/android:java",
     "//chrome/browser/download/android:java_resources",
+    "//chrome/browser/engagement/android:java",
     "//chrome/browser/enterprise/util:java",
     "//chrome/browser/flags:java",
     "//chrome/browser/fullscreen/android:java",
@@ -959,6 +960,7 @@ android_library("chrome_test_java") {
     "//chrome/browser/android/lifecycle:java",
     "//chrome/browser/browser_controls/android:java",
     "//chrome/browser/download/android:java",
+    "//chrome/browser/engagement/android:java",
     "//chrome/browser/enterprise/util:java",
     "//chrome/browser/flags:java",
     "//chrome/browser/fullscreen/android:java",
@@ -2303,6 +2305,7 @@ chrome_test_apk_tmpl("chrome_public_test_apk") {
     "//chrome/android/webapk/libs/runtime_library:runtime_library_javatests",
     "//chrome/android/webapk/shell_apk:shell_apk_javatests",
     "//chrome/browser/download/android:download_java_tests",
+    "//chrome/browser/engagement/android:javatests",
     "//chrome/browser/flags:javatests",
     "//chrome/browser/password_check/android:test_java",
     "//chrome/browser/subresource_filter:subresource_filter_javatests",
@@ -2934,7 +2937,6 @@ generate_jni("chrome_jni_headers") {
     "java/src/org/chromium/chrome/browser/download/items/OfflineContentAggregatorFactory.java",
     "java/src/org/chromium/chrome/browser/download/service/DownloadBackgroundTask.java",
     "java/src/org/chromium/chrome/browser/download/service/DownloadTaskScheduler.java",
-    "java/src/org/chromium/chrome/browser/engagement/SiteEngagementService.java",
     "java/src/org/chromium/chrome/browser/explore_sites/ExploreSitesBridge.java",
     "java/src/org/chromium/chrome/browser/explore_sites/ExploreSitesBridgeExperimental.java",
     "java/src/org/chromium/chrome/browser/explore_sites/ExploreSitesCategory.java",

chrome/android/chrome_java_sources.gni

@@ -659,7 +659,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/download/items/OfflineContentAggregatorNotificationBridgeUiFactory.java",
   "java/src/org/chromium/chrome/browser/download/service/DownloadBackgroundTask.java",
   "java/src/org/chromium/chrome/browser/download/service/DownloadTaskScheduler.java",
-  "java/src/org/chromium/chrome/browser/engagement/SiteEngagementService.java",
   "java/src/org/chromium/chrome/browser/explore_sites/CategoryCardAdapter.java",
   "java/src/org/chromium/chrome/browser/explore_sites/CategoryCardViewHolderFactory.java",
   "java/src/org/chromium/chrome/browser/explore_sites/CategoryCardViewHolderFactoryDenseTitleBottom.java",

chrome/android/chrome_test_java_sources.gni

@@ -175,7 +175,6 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/download/home/DownloadActivityV2Test.java",
   "javatests/src/org/chromium/chrome/browser/download/home/StubbedOfflineContentProvider.java",
   "javatests/src/org/chromium/chrome/browser/download/ui/StubbedProvider.java",
-  "javatests/src/org/chromium/chrome/browser/engagement/SiteEngagementServiceTest.java",
   "javatests/src/org/chromium/chrome/browser/explore_sites/ExploreSitesBridgeExperimentalTest.java",
   "javatests/src/org/chromium/chrome/browser/explore_sites/ExploreSitesCategoryCardViewDenseTitleBottomTest.java",
   "javatests/src/org/chromium/chrome/browser/explore_sites/ExploreSitesCategoryCardViewDenseTitleRightTest.java",

chrome/android/java/src/org/chromium/chrome/browser/engagement/OWNERS

-dominickn@chromium.org

chrome/browser/BUILD.gn

@@ -2951,6 +2951,7 @@ static_library("browser") {
       "//url:origin_android",
     ]
 
+    deps += [ "//chrome/browser/engagement/android:jni_headers" ]
     deps -= [ "//components/storage_monitor" ]
 
     if (enable_supervised_users) {

chrome/browser/DEPS

@@ -447,7 +447,7 @@ include_rules = [
 ]
 
 specific_include_rules = {
-  '.*InstrumentationTest\.java': [
+  '.*Test\.java': [
     # Android instrumentation tests depend on the whole app.
     "+chrome/android",
   ],

chrome/browser/engagement/android/BUILD.gn

+# Copyright 2015 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.
+
+import("//build/config/android/rules.gni")
+
+android_library("java") {
+  sources = [ "java/src/org/chromium/chrome/browser/engagement/SiteEngagementService.java" ]
+  deps = [
+    ":jni_headers",
+    "//base:base_java",
+    "//base:jni_java",
+    "//chrome/browser/profiles/android:java",
+  ]
+  annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
+}
+
+android_library("javatests") {
+  testonly = true
+  sources = [ "java/src/org/chromium/chrome/browser/engagement/SiteEngagementServiceTest.java" ]
+  deps = [
+    ":java",
+    "//base:base_java_test_support",
+    "//chrome/android:chrome_java",
+    "//chrome/browser/profiles/android:java",
+    "//chrome/browser/tab:java",
+    "//chrome/test/android:chrome_java_test_support",
+    "//third_party/junit:junit",
+  ]
+}
+
+generate_jni("jni_headers") {
+  sources = [ "java/src/org/chromium/chrome/browser/engagement/SiteEngagementService.java" ]
+}

chrome/android/java/src/org/chromium/chrome/browser/engagement/SiteEngagementService.java → chrome/browser/engagement/android/java/src/org/chromium/chrome/browser/engagement/SiteEngagementService.java

@@ -16,7 +16,6 @@ import org.chromium.chrome.browser.profiles.Profile;
  * allows Java to retrieve and modify engagement scores for URLs.
  */
 public class SiteEngagementService {
-
     /** Pointer to the native side SiteEngagementServiceAndroid shim. */
     private long mNativePointer;
 

chrome/browser/engagement/site_engagement_service_android.cc

@@ -6,7 +6,7 @@
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
-#include "chrome/android/chrome_jni_headers/SiteEngagementService_jni.h"
+#include "chrome/browser/engagement/android/jni_headers/SiteEngagementService_jni.h"
 #include "chrome/browser/engagement/site_engagement_score.h"
 #include "chrome/browser/profiles/profile_android.h"
 #include "url/gurl.h"