Revert "Move some JNI headers from chrome_apk target to browser library target"

This reverts commit 2466c430c4341f2ecfafd8b4e846c46147ae54a7.

NOTRY=true
BUG=484934

Review URL: https://codereview.chromium.org/1149893011

Cr-Commit-Position: refs/heads/master@{#331850}

15 files changed, 51 insertions, 76 deletions

diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index fc6f37a..5116295 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -742,6 +742,7 @@ generate_jni("staging_jni_headers") {
 # GYP: //chrome/android/chrome_apk.gyp:libchrome_staging
 static_library("chrome_staging") {
   deps = [
+    ":proto",
     ":staging_jni_headers",
     "//chrome/browser",
     "//chrome:strings",
@@ -774,3 +775,11 @@ static_library("chrome_staging") {
 
   defines = []
 }
+
+proto_library("proto") {
+  sources = [
+    "../browser/android/proto/client_discourse_context.proto",
+    "../browser/android/proto/delta_file.proto",
+  ]
+  proto_out_dir = "chrome/browser/android/proto"
+}
diff --git a/chrome/android/chrome_apk.gyp b/chrome/android/chrome_apk.gyp
index 5034736..e1ba28d 100644
--- a/chrome/android/chrome_apk.gyp
+++ b/chrome/android/chrome_apk.gyp
@@ -28,7 +28,10 @@
       '<(chrome_java_dir)/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManager.java',
       '<(chrome_java_dir)/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchTabHelper.java',
       '<(chrome_java_dir)/src/org/chromium/chrome/browser/document/DocumentWebContentsDelegate.java',
+      '<(chrome_java_dir)/src/org/chromium/chrome/browser/historyreport/HistoryReportJniBridge.java',
+      '<(chrome_java_dir)/src/org/chromium/chrome/browser/policy/PolicyManager.java',
       '<(chrome_java_dir)/src/org/chromium/chrome/browser/rlz/RevenueStats.java',
+      '<(chrome_java_dir)/src/org/chromium/chrome/browser/tab/BackgroundContentViewHelper.java',
       '<(chrome_java_dir)/src/org/chromium/chrome/browser/tab/ThumbnailTabHelper.java',
     ],
     # This list is shared with GN.
@@ -60,10 +63,38 @@
       '<(chrome_native_sources_dir)/contextualsearch/contextual_search_tab_helper.cc',
       '<(chrome_native_sources_dir)/contextualsearch/contextual_search_tab_helper.h',
       '<(chrome_native_sources_dir)/document/document_web_contents_delegate.cc',
+      '<(chrome_native_sources_dir)/history_report/data_observer.cc',
+      '<(chrome_native_sources_dir)/history_report/data_observer.h',
+      '<(chrome_native_sources_dir)/history_report/data_provider.cc',
+      '<(chrome_native_sources_dir)/history_report/data_provider.h',
+      '<(chrome_native_sources_dir)/history_report/delta_file_backend_leveldb.cc',
+      '<(chrome_native_sources_dir)/history_report/delta_file_backend_leveldb.h',
+      '<(chrome_native_sources_dir)/history_report/delta_file_commons.cc',
+      '<(chrome_native_sources_dir)/history_report/delta_file_commons.h',
+      '<(chrome_native_sources_dir)/history_report/delta_file_service.cc',
+      '<(chrome_native_sources_dir)/history_report/delta_file_service.h',
+      '<(chrome_native_sources_dir)/history_report/get_all_urls_from_history_task.cc',
+      '<(chrome_native_sources_dir)/history_report/get_all_urls_from_hisotry_task.h',
+      '<(chrome_native_sources_dir)/history_report/historic_visits_migration_task.cc',
+      '<(chrome_native_sources_dir)/history_report/historic_visits_migration_task.h',
+      '<(chrome_native_sources_dir)/history_report/history_report_jni_bridge.cc',
+      '<(chrome_native_sources_dir)/history_report/history_report_jni_bridge.h',
+      '<(chrome_native_sources_dir)/history_report/usage_report_util.cc',
+      '<(chrome_native_sources_dir)/history_report/usage_report_util.h',
+      '<(chrome_native_sources_dir)/history_report/usage_reports_buffer_backend.cc',
+      '<(chrome_native_sources_dir)/history_report/usage_reports_buffer_backend.h',
+      '<(chrome_native_sources_dir)/history_report/usage_reports_buffer_service.cc',
+      '<(chrome_native_sources_dir)/history_report/usage_reports_buffer_service.h',
+      '<(chrome_native_sources_dir)/policy/policy_manager.cc',
+      '<(chrome_native_sources_dir)/policy/policy_manager.h',
+      '<(chrome_native_sources_dir)/proto/client_discourse_context.proto',
+      '<(chrome_native_sources_dir)/proto/delta_file.proto',
       '<(chrome_native_sources_dir)/rlz/revenue_stats.cc',
       '<(chrome_native_sources_dir)/rlz/revenue_stats.h',
       '<(chrome_native_sources_dir)/staging_jni_registrar.cc',
       '<(chrome_native_sources_dir)/staging_jni_registrar.h',
+      '<(chrome_native_sources_dir)/tab/background_content_view_helper.cc',
+      '<(chrome_native_sources_dir)/tab/background_content_view_helper.h',
       '<(chrome_native_sources_dir)/tab/thumbnail_tab_helper_android.cc',
       '<(chrome_native_sources_dir)/tab/thumbnail_tab_helper_android.h',
     ],
@@ -113,6 +144,11 @@
           ],
         }],
       ],
+      'variables': {
+        'proto_in_dir': '<(chrome_native_sources_dir)/proto',
+        'proto_out_dir': 'chrome/browser/android/proto',
+      },
+      'includes': [ '../../build/protoc.gypi', ],
     },
     {
       # GN: //chrome/android:staging_jni_headers
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/historyreport/DeltaFileEntry.java b/chrome/android/java_staging/src/org/chromium/chrome/browser/historyreport/DeltaFileEntry.java
index cff10e4..cff10e4 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/historyreport/DeltaFileEntry.java
+++ b/chrome/android/java_staging/src/org/chromium/chrome/browser/historyreport/DeltaFileEntry.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/historyreport/HistoryReportJniBridge.java b/chrome/android/java_staging/src/org/chromium/chrome/browser/historyreport/HistoryReportJniBridge.java
index 0cb9949..0cb9949 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/historyreport/HistoryReportJniBridge.java
+++ b/chrome/android/java_staging/src/org/chromium/chrome/browser/historyreport/HistoryReportJniBridge.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/historyreport/SearchJniBridge.java b/chrome/android/java_staging/src/org/chromium/chrome/browser/historyreport/SearchJniBridge.java
index 2ba996d..2ba996d 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/historyreport/SearchJniBridge.java
+++ b/chrome/android/java_staging/src/org/chromium/chrome/browser/historyreport/SearchJniBridge.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/historyreport/UsageReport.java b/chrome/android/java_staging/src/org/chromium/chrome/browser/historyreport/UsageReport.java
index 7d08baa..7d08baa 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/historyreport/UsageReport.java
+++ b/chrome/android/java_staging/src/org/chromium/chrome/browser/historyreport/UsageReport.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/policy/PolicyAuditor.java b/chrome/android/java_staging/src/org/chromium/chrome/browser/policy/PolicyAuditor.java
index 60f8e5f..60f8e5f 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/policy/PolicyAuditor.java
+++ b/chrome/android/java_staging/src/org/chromium/chrome/browser/policy/PolicyAuditor.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/policy/PolicyManager.java b/chrome/android/java_staging/src/org/chromium/chrome/browser/policy/PolicyManager.java
index 9856dba..9856dba 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/policy/PolicyManager.java
+++ b/chrome/android/java_staging/src/org/chromium/chrome/browser/policy/PolicyManager.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/policy/PolicyProvider.java b/chrome/android/java_staging/src/org/chromium/chrome/browser/policy/PolicyProvider.java
index f26e4de..f26e4de 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/policy/PolicyProvider.java
+++ b/chrome/android/java_staging/src/org/chromium/chrome/browser/policy/PolicyProvider.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/policy/providers/AppRestrictionsProvider.java b/chrome/android/java_staging/src/org/chromium/chrome/browser/policy/providers/AppRestrictionsProvider.java
index b5c45c8..b5c45c8 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/policy/providers/AppRestrictionsProvider.java
+++ b/chrome/android/java_staging/src/org/chromium/chrome/browser/policy/providers/AppRestrictionsProvider.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/BackgroundContentViewHelper.java b/chrome/android/java_staging/src/org/chromium/chrome/browser/tab/BackgroundContentViewHelper.java
index e9c95a3..e9c95a3 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/tab/BackgroundContentViewHelper.java
+++ b/chrome/android/java_staging/src/org/chromium/chrome/browser/tab/BackgroundContentViewHelper.java
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index b82ef98..7c58247 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -6,7 +6,6 @@ import("//build/config/chrome_build.gni")
 import("//build/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
-import("//third_party/protobuf/proto_library.gni")
 
 # //build/config/android/rules.gni imports //tools/grit/grit_rule.gni, which
 # produces a conflict for the "grit" template so we have to only include one.
@@ -624,8 +623,6 @@ source_set("browser") {
     sources +=
         rebase_path(gypi_values.chrome_browser_android_sources, ".", "//chrome")
     deps += [
-      ":client_discourse_context_proto",
-      ":delta_file_proto",
       ":jni_headers",
       "//components/cdm/browser",
       "//components/enhanced_bookmarks",
@@ -813,20 +810,6 @@ if (is_android) {
         rebase_path(gypi_values.chrome_browser_jni_sources, ".", "//chrome")
     jni_package = "chrome"
   }
-
-  #GYP: '//chrome/chrome_browser.gypi:client_discourse_context_proto'
-  proto_library("client_discourse_context_proto") {
-    sources = [
-      "android/proto/client_discourse_context.proto",
-    ]
-  }
-
-  #GYP: '//chrome/chrome_browser.gypi:delta_file_proto'
-  proto_library("delta_file_proto") {
-    sources = [
-      "android/proto/delta_file.proto",
-    ]
-  }
 }
 
 if (is_win) {
diff --git a/chrome/browser/android/chrome_jni_registrar.cc b/chrome/browser/android/chrome_jni_registrar.cc
index bc053a6..c4e333b 100644
--- a/chrome/browser/android/chrome_jni_registrar.cc
+++ b/chrome/browser/android/chrome_jni_registrar.cc
@@ -31,7 +31,6 @@
 #include "chrome/browser/android/find_in_page/find_in_page_bridge.h"
 #include "chrome/browser/android/foreign_session_helper.h"
 #include "chrome/browser/android/fullscreen/fullscreen_infobar_delegate.h"
-#include "chrome/browser/android/history_report/history_report_jni_bridge.h"
 #include "chrome/browser/android/intent_helper.h"
 #include "chrome/browser/android/java_exception_reporter.h"
 #include "chrome/browser/android/large_icon_bridge.h"
@@ -47,7 +46,6 @@
 #include "chrome/browser/android/omnibox/autocomplete_controller_android.h"
 #include "chrome/browser/android/omnibox/omnibox_prerender.h"
 #include "chrome/browser/android/password_ui_view_android.h"
-#include "chrome/browser/android/policy/policy_manager.h"
 #include "chrome/browser/android/precache/precache_launcher.h"
 #include "chrome/browser/android/preferences/autofill/autofill_profile_bridge.h"
 #include "chrome/browser/android/preferences/pref_service_bridge.h"
@@ -58,7 +56,6 @@
 #include "chrome/browser/android/shortcut_helper.h"
 #include "chrome/browser/android/signin/account_management_screen_helper.h"
 #include "chrome/browser/android/signin/signin_manager_android.h"
-#include "chrome/browser/android/tab/background_content_view_helper.h"
 #include "chrome/browser/android/tab_android.h"
 #include "chrome/browser/android/tab_state.h"
 #include "chrome/browser/android/url_utilities.h"
@@ -168,7 +165,6 @@ static base::android::RegistrationMethod kChromeRegisteredMethods[] = {
     {"AutofillPopup",
      autofill::AutofillPopupViewAndroid::RegisterAutofillPopupViewAndroid},
     {"AutofillProfileBridge", autofill::RegisterAutofillProfileBridge},
-    {"BackgroundContentViewHelper", BackgroundContentViewHelper::Register},
     {"BookmarksBridge", BookmarksBridge::RegisterBookmarksBridge},
     {"CardUnmaskPrompt", autofill::CardUnmaskPromptViewAndroid::Register},
     {"CertificateViewer", RegisterCertificateViewer},
@@ -215,7 +211,6 @@ static base::android::RegistrationMethod kChromeRegisteredMethods[] = {
      FullscreenInfoBarDelegate::RegisterFullscreenInfoBarDelegate},
     {"GeneratedPasswordSavedInfoBarDelegate",
      RegisterGeneratedPasswordSavedInfoBarDelegate},
-    {"HistoryReportJniBridge", history_report::RegisterHistoryReportJniBridge},
     {"InfoBarContainer", RegisterInfoBarContainer},
     {"InvalidationServiceFactory",
      invalidation::InvalidationServiceFactoryAndroid::Register},
@@ -247,7 +242,6 @@ static base::android::RegistrationMethod kChromeRegisteredMethods[] = {
      PasswordUIViewAndroid::RegisterPasswordUIViewAndroid},
     {"PersonalDataManagerAndroid",
      autofill::PersonalDataManagerAndroid::Register},
-    {"PolicyManager", RegisterPolicyManager},
     {"PrecacheLauncher", RegisterPrecacheLauncher},
     {"PrefServiceBridge", RegisterPrefServiceBridge},
     {"ProfileAndroid", ProfileAndroid::RegisterProfileAndroid},
diff --git a/chrome/browser/android/staging_jni_registrar.cc b/chrome/browser/android/staging_jni_registrar.cc
index 535a458..6818169 100644
--- a/chrome/browser/android/staging_jni_registrar.cc
+++ b/chrome/browser/android/staging_jni_registrar.cc
@@ -15,18 +15,24 @@
 #include "chrome/browser/android/contextualsearch/contextual_search_manager.h"
 #include "chrome/browser/android/contextualsearch/contextual_search_tab_helper.h"
 #include "chrome/browser/android/document/document_web_contents_delegate.h"
+#include "chrome/browser/android/history_report/history_report_jni_bridge.h"
+#include "chrome/browser/android/policy/policy_manager.h"
 #include "chrome/browser/android/rlz/revenue_stats.h"
+#include "chrome/browser/android/tab/background_content_view_helper.h"
 #include "chrome/browser/android/tab/thumbnail_tab_helper_android.h"
 
 namespace chrome {
 namespace android {
 static base::android::RegistrationMethod kRegistrationMethods[] = {
+    {"BackgroundContentViewHelper", BackgroundContentViewHelper::Register},
     {"CompositorView", RegisterCompositorView},
     {"ContextualSearchManager", RegisterContextualSearchManager},
     {"ContextualSearchSceneLayer", RegisterContextualSearchSceneLayer},
     {"ContextualSearchTabHelper", RegisterContextualSearchTabHelper},
     {"DocumentWebContentsDelegate", DocumentWebContentsDelegate::Register},
     {"EditBookmarkHelper", RegisterEditBookmarkHelper},
+    {"HistoryReportJniBridge", history_report::RegisterHistoryReportJniBridge},
+    {"PolicyManager", RegisterPolicyManager},
     {"ReaderModeSceneLayer", RegisterReaderModeSceneLayer},
     {"RevenueStats", RegisterRevenueStats},
     {"TabListSceneLayer", RegisterTabListSceneLayer},
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index ad5b486..2a17889 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -104,28 +104,6 @@
       'browser/android/foreign_session_helper.h',
       'browser/android/fullscreen/fullscreen_infobar_delegate.cc',
       'browser/android/fullscreen/fullscreen_infobar_delegate.h',
-      'browser/android/history_report/data_observer.cc',
-      'browser/android/history_report/data_observer.h',
-      'browser/android/history_report/data_provider.cc',
-      'browser/android/history_report/data_provider.h',
-      'browser/android/history_report/delta_file_backend_leveldb.cc',
-      'browser/android/history_report/delta_file_backend_leveldb.h',
-      'browser/android/history_report/delta_file_commons.cc',
-      'browser/android/history_report/delta_file_commons.h',
-      'browser/android/history_report/delta_file_service.cc',
-      'browser/android/history_report/delta_file_service.h',
-      'browser/android/history_report/get_all_urls_from_history_task.cc',
-      'browser/android/history_report/get_all_urls_from_history_task.h',
-      'browser/android/history_report/historic_visits_migration_task.cc',
-      'browser/android/history_report/historic_visits_migration_task.h',
-      'browser/android/history_report/history_report_jni_bridge.cc',
-      'browser/android/history_report/history_report_jni_bridge.h',
-      'browser/android/history_report/usage_report_util.cc',
-      'browser/android/history_report/usage_report_util.h',
-      'browser/android/history_report/usage_reports_buffer_backend.cc',
-      'browser/android/history_report/usage_reports_buffer_backend.h',
-      'browser/android/history_report/usage_reports_buffer_service.cc',
-      'browser/android/history_report/usage_reports_buffer_service.h',
       'browser/android/intent_helper.cc',
       'browser/android/intent_helper.h',
       'browser/android/intercept_download_resource_throttle.cc',
@@ -163,8 +141,6 @@
       'browser/android/omnibox/omnibox_prerender.h',
       'browser/android/password_ui_view_android.cc',
       'browser/android/password_ui_view_android.h',
-      'browser/android/policy/policy_manager.cc',
-      'browser/android/policy/policy_manager.h',
       'browser/android/precache/precache_launcher.cc',
       'browser/android/precache/precache_launcher.h',
       'browser/android/preferences/autofill/autofill_profile_bridge.cc',
@@ -199,8 +175,6 @@
       'browser/android/signin/account_management_screen_helper.h',
       'browser/android/signin/signin_manager_android.cc',
       'browser/android/signin/signin_manager_android.h',
-      'browser/android/tab/background_content_view_helper.cc',
-      'browser/android/tab/background_content_view_helper.h',
       'browser/android/tab_android.cc',
       'browser/android/tab_android.h',
       'browser/android/tab_load_status.h',
@@ -1709,7 +1683,6 @@
       'android/java/src/org/chromium/chrome/browser/findinpage/FindInPageBridge.java',
       'android/java/src/org/chromium/chrome/browser/fullscreen/FullscreenInfoBarDelegate.java',
       'android/java/src/org/chromium/chrome/browser/ForeignSessionHelper.java',
-      'android/java/src/org/chromium/chrome/browser/historyreport/HistoryReportJniBridge.java',
       'android/java/src/org/chromium/chrome/browser/JavaExceptionReporter.java',
       'android/java/src/org/chromium/chrome/browser/LogoBridge.java',
       'android/java/src/org/chromium/chrome/browser/NewTabPagePrefs.java',
@@ -1731,7 +1704,6 @@
       'android/java/src/org/chromium/chrome/browser/omnibox/OmniboxViewUtil.java',
       'android/java/src/org/chromium/chrome/browser/partnerbookmarks/PartnerBookmarksReader.java',
       'android/java/src/org/chromium/chrome/browser/password_manager/Credential.java',
-      'android/java/src/org/chromium/chrome/browser/policy/PolicyManager.java',
       'android/java/src/org/chromium/chrome/browser/PasswordUIView.java',
       'android/java/src/org/chromium/chrome/browser/precache/PrecacheLauncher.java',
       'android/java/src/org/chromium/chrome/browser/preferences/autofill/AutofillProfileBridge.java',
@@ -1750,7 +1722,6 @@
       'android/java/src/org/chromium/chrome/browser/signin/OAuth2TokenService.java',
       'android/java/src/org/chromium/chrome/browser/signin/SigninManager.java',
       'android/java/src/org/chromium/chrome/browser/sync/ProfileSyncService.java',
-      'android/java/src/org/chromium/chrome/browser/tab/BackgroundContentViewHelper.java',
       'android/java/src/org/chromium/chrome/browser/tabmodel/SingleTabModel.java',
       'android/java/src/org/chromium/chrome/browser/tabmodel/TabModelJniBridge.java',
       'android/java/src/org/chromium/chrome/browser/Tab.java',
@@ -3587,8 +3558,6 @@
             '../third_party/android_opengl/etc1/etc1.gyp:etc1',
             '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput_util',
             'chrome_browser_jni_headers',
-            'client_discourse_context_proto',
-            'delta_file_proto',
           ],
           'dependencies!': [
             '../components/components.gyp:storage_monitor',
@@ -3928,28 +3897,6 @@
           'includes': [ '../build/android/java_cpp_enum.gypi' ],
         },
         {
-          #GN: //chrome/browser:client_discourse_context_proto
-          'target_name': 'client_discourse_context_proto',
-          'type': 'static_library',
-          'sources': ['browser/android/proto/client_discourse_context.proto' ],
-          'variables': {
-            'proto_in_dir': 'browser/android/proto',
-            'proto_out_dir': 'chrome/browser/android/proto',
-          },
-          'includes': [ '../build/protoc.gypi', ],
-        },
-        {
-          #GN: //chrome/browser:delta_file_proto
-          'target_name': 'delta_file_proto',
-          'type': 'static_library',
-          'sources': [ 'browser/android/proto/delta_file.proto' ],
-          'variables': {
-            'proto_in_dir': 'browser/android/proto',
-            'proto_out_dir': 'chrome/browser/android/proto',
-          },
-          'includes': [ '../build/protoc.gypi', ],
-        },
-        {
           # Protobuf compiler / generator for Android's DocumentTabModel
           # protocol buffer.
           # GN: //chrome/android: document_tab_model_info_proto_java