Index: content/browser/android/browser_jni_registrar.cc |
diff --git a/content/browser/android/browser_jni_registrar.cc b/content/browser/android/browser_jni_registrar.cc |
index 1be2ea585fe00fc454f67d7a2375a72000c9bb56..87d8d5929c95d43f535fd66c4c0f969211d9c3c0 100644 |
--- a/content/browser/android/browser_jni_registrar.cc |
+++ b/content/browser/android/browser_jni_registrar.cc |
@@ -22,6 +22,7 @@ |
#include "content/browser/android/interstitial_page_delegate_android.h" |
#include "content/browser/android/load_url_params.h" |
#include "content/browser/android/popup_touch_handle_drawable.h" |
+#include "content/browser/android/service_registry_android_impl.h" |
#include "content/browser/android/tracing_controller_android.h" |
#include "content/browser/android/web_contents_observer_proxy.h" |
#include "content/browser/device_sensors/sensor_manager_android.h" |
@@ -31,7 +32,6 @@ |
#include "content/browser/media/android/media_resource_getter_impl.h" |
#include "content/browser/media/session/media_session_delegate_android.h" |
#include "content/browser/mojo/service_registrar_android.h" |
-#include "content/browser/mojo/service_registry_android.h" |
#include "content/browser/power_save_blocker_android.h" |
#include "content/browser/renderer_host/ime_adapter_android.h" |
#include "content/browser/renderer_host/input/synthetic_gesture_target_android.h" |
@@ -89,7 +89,7 @@ base::android::RegistrationMethod kContentRegisteredMethods[] = { |
content::ScreenOrientationDelegateAndroid::Register}, |
{"SensorManagerAndroid", content::SensorManagerAndroid::Register}, |
{"ServiceRegistrarAndroid", content::ServiceRegistrarAndroid::Register}, |
- {"ServiceRegistryAndroid", content::ServiceRegistryAndroid::Register}, |
+ {"ServiceRegistryAndroid", content::ServiceRegistryAndroidImpl::Register}, |
{"SpeechRecognizerImplAndroid", |
content::SpeechRecognizerImplAndroid::RegisterSpeechRecognizer}, |
{"TimeZoneMonitorAndroid", content::TimeZoneMonitorAndroid::Register}, |