Register JNI for content_unittests.

content/browser/android/browser_jni_registrar.cc

Index: content/browser/android/browser_jni_registrar.cc
diff --git a/content/app/android/content_jni_registrar.cc b/content/browser/android/browser_jni_registrar.cc
similarity index 55%
rename from content/app/android/content_jni_registrar.cc
rename to content/browser/android/browser_jni_registrar.cc
index c3481ee9327d6ba33b1da12a1a79e31879eed459..b58d432bc97b6d5e7ccf166a58ddf39b90264e28 100644
--- a/content/app/android/content_jni_registrar.cc
+++ b/content/browser/android/browser_jni_registrar.cc
@@ -2,13 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/app/android/content_jni_registrar.h"
+#include "content/browser/android/browser_jni_registrar.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_registrar.h"
-#include "content/app/android/content_main.h"
-#include "content/app/android/sandboxed_process_service.h"
-#include "content/app/android/user_agent.h"
 #include "content/browser/android/android_browser_process.h"
 #include "content/browser/android/content_settings.h"
 #include "content/browser/android/content_view_client.h"
@@ -18,33 +15,28 @@
 #include "content/browser/android/sandboxed_process_launcher.h"
 #include "content/browser/android/touch_point.h"
 #include "content/browser/geolocation/location_api_adapter_android.h"
-#include "content/common/android/command_line.h"
-#include "content/common/android/surface_callback.h"
-#include "content/common/android/trace_event_binding.h"
-
-namespace content {
-namespace android {
 
+namespace {
 base::android::RegistrationMethod kContentRegisteredMethods[] = {
   { "AndroidLocationApiAdapter",
-     AndroidLocationApiAdapter::RegisterGeolocationService },
+    AndroidLocationApiAdapter::RegisterGeolocationService },
   { "AndroidBrowserProcess", content::RegisterAndroidBrowserProcess },
-  { "CommandLine", RegisterCommandLine },
-  { "ContentSettings", ContentSettings::RegisterContentSettings },
-  { "ContentView", RegisterContentView },
-  { "ContentViewClient", RegisterContentViewClient },
-  { "ContentMain", content::RegisterContentMain },
-  { "DeviceInfo", RegisterDeviceInfo },
-  { "DownloadController", DownloadController::RegisterDownloadController },
+  { "ContentSettings", content::ContentSettings::RegisterContentSettings },
+  { "ContentView", content::RegisterContentView },
+  { "ContentViewClient", content::RegisterContentViewClient },
+  { "DeviceInfo", content::RegisterDeviceInfo },
+  { "DownloadController",
+    content::DownloadController::RegisterDownloadController },
   { "SandboxedProcessLauncher", content::RegisterSandboxedProcessLauncher },
-  { "SandboxedProcessService", content::RegisterSandboxedProcessService },
-  { "SurfaceCallback", content::RegisterSurfaceCallback },
   { "TouchPoint", content::RegisterTouchPoint },
-  { "TraceEvent", RegisterTraceEvent },
-  { "UserAgent", content::RegisterUserAgent },
 };
 
-bool RegisterJni(JNIEnv* env) {
+}  // namespace
+
+namespace content {
+namespace android {
+
+bool RegisterBrowserJni(JNIEnv* env) {
   return RegisterNativeMethods(env, kContentRegisteredMethods,
                                arraysize(kContentRegisteredMethods));
 }