Reland: Move some JNI headers from chrome_apk target to browser library target

Move JNI headers for
  HistoryReportJniBridge.java
  PolicyManager.java
  BackgroundContentViewHelper.java
to browser library target

BUG=484934
TEST=None
R=newt
TBR=sky@ for chrome/browser/build.gn

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

Cr-Commit-Position: refs/heads/master@{#331975}
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index 7c58247..b82ef98 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -6,6 +6,7 @@
 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.
@@ -623,6 +624,8 @@
     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",
@@ -810,6 +813,20 @@
         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) {