Remove dom_distiller core dependency on content

chrome/browser/android/chrome_jni_registrar.cc

 // Copyright (c) 2012 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 "chrome/browser/android/chrome_jni_registrar.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_registrar.h"
 #include "base/macros.h"
 #include "base/trace_event/trace_event.h"
@@ skipping 134 matching lines @@
 #include "chrome/browser/ui/android/javascript_app_modal_dialog_android.h"
 #include "chrome/browser/ui/android/omnibox/omnibox_url_emphasizer.h"
 #include "chrome/browser/ui/android/omnibox/omnibox_view_util.h"
 #include "chrome/browser/ui/android/snackbars/auto_signin_prompt_controller.h"
 #include "chrome/browser/ui/android/ssl_client_certificate_request.h"
 #include "chrome/browser/ui/android/tab_model/single_tab_model.h"
 #include "chrome/browser/ui/android/tab_model/tab_model_jni_bridge.h"
 #include "chrome/browser/ui/android/toolbar/toolbar_model_android.h"
 #include "chrome/browser/ui/android/usb_chooser_dialog_android.h"
 #include "chrome/browser/ui/android/website_settings_popup_android.h"
-#include "components/dom_distiller/android/component_jni_registrar.h"
+#include "components/dom_distiller/content/browser/android/content_jni_registrar.h"
+#include "components/dom_distiller/core/android/core_jni_registrar.h"
 #include "components/gcm_driver/android/component_jni_registrar.h"
 #include "components/gcm_driver/instance_id/android/component_jni_registrar.h"
 #include "components/invalidation/impl/android/component_jni_registrar.h"
 #include "components/policy/core/browser/android/component_jni_registrar.h"
 #include "components/safe_json/android/component_jni_registrar.h"
 #include "components/signin/core/browser/android/component_jni_registrar.h"
 #include "components/spellcheck/browser/android/component_jni_registrar.h"
 #include "components/sync/android/sync_jni_registrar.h"
 #include "components/url_formatter/android/component_jni_registrar.h"
 #include "components/variations/android/component_jni_registrar.h"
 #include "components/web_contents_delegate_android/component_jni_registrar.h"
 
 #if defined(ENABLE_PRINTING) && !defined(ENABLE_PRINT_PREVIEW)
 #include "printing/printing_context_android.h"
 #endif
 
 #if defined(ENABLE_VR_SHELL)
 #include "chrome/browser/android/vr_shell/vr_shell.h"
 #endif
 
 namespace chrome {
 namespace android {
 
 static base::android::RegistrationMethod kChromeRegisteredMethods[] = {
     // Register JNI for components we depend on.
     {"AppMenuDragHelper", RegisterAppMenuDragHelper},
-    {"DomDistiller", dom_distiller::android::RegisterDomDistiller},
+    {"DomDistillerContent",
+     dom_distiller::content::android::RegisterDomDistiller},
+    {"DomDistillerCore", dom_distiller::core::android::RegisterDomDistiller},
     {"ChromeDownloadDelegate", RegisterChromeDownloadDelegate},
     {"GCMDriver", gcm::android::RegisterGCMDriverJni},
     {"InstanceID", instance_id::android::RegisterInstanceIDJni},
     {"Invalidation", invalidation::android::RegisterInvalidationJni},
     {"Policy", policy::android::RegisterPolicy},
     {"SafeJson", safe_json::android::RegisterSafeJsonJni},
     {"Signin", signin::android::RegisterSigninJni},
     {"UrlFormatter", url_formatter::android::RegisterUrlFormatter},
     {"WebContentsDelegateAndroid",
      web_contents_delegate_android::RegisterWebContentsDelegateAndroidJni},
@@ skipping 186 matching lines @@
 };
 
 bool RegisterBrowserJNI(JNIEnv* env) {
   TRACE_EVENT0("startup", "chrome_android::RegisterJni");
   return RegisterNativeMethods(env, kChromeRegisteredMethods,
                                arraysize(kChromeRegisteredMethods));
 }
 
 }  // namespace android
 }  // namespace chrome