[Android] Fix device_info registration.

It moved from browser->content and should be in the right registrar.


Review URL: https://chromiumcodereview.appspot.com/10834268

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151094 0039d316-1c4b-4281-b951-d872f2087c98

content/browser/android/browser_jni_registrar.cc

@@ -17,7 +17,6 @@
 #include "content/browser/android/touch_point.h"
 #include "content/browser/geolocation/location_api_adapter_android.h"
 #include "content/browser/renderer_host/java/java_bound_object.h"
-#include "content/common/android/device_info.h"
 
 namespace {
 base::android::RegistrationMethod kContentRegisteredMethods[] = {
@@ -28,7 +27,6 @@ base::android::RegistrationMethod kContentRegisteredMethods[] = {
   { "ContentVideoView", content::ContentVideoView::RegisterContentVideoView },
   { "ContentViewClient", content::RegisterContentViewClient },
   { "ContentViewCore", content::RegisterContentViewCore },
-  { "DeviceInfo", content::RegisterDeviceInfo },
   { "DownloadController",
     content::DownloadController::RegisterDownloadController },
   { "JavaBoundObject", JavaBoundObject::RegisterJavaBoundObject },

content/common/android/common_jni_registrar.cc

@@ -7,6 +7,7 @@
 #include "base/android/jni_android.h"
 #include "base/android/jni_registrar.h"
 #include "content/common/android/command_line.h"
+#include "content/common/android/device_info.h"
 #include "content/common/android/surface_callback.h"
 #include "content/common/android/surface_texture_listener.h"
 #include "content/common/android/trace_event_binding.h"
@@ -14,6 +15,7 @@
 namespace {
 base::android::RegistrationMethod kContentRegisteredMethods[] = {
   { "CommandLine", RegisterCommandLine },
+  { "DeviceInfo", content::RegisterDeviceInfo },
   { "SurfaceCallback", content::RegisterSurfaceCallback },
   { "SurfaceTextureListener",
         content::SurfaceTextureListener::RegisterSurfaceTextureListener },