Switch base/ registrations to a static class method where appropriate.

BUG=
TEST=


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

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

5 files changed, 17 insertions, 13 deletions

diff --git a/base/android/base_jni_registrar.cc b/base/android/base_jni_registrar.cc
index 06b0149..4ec2047 100644
--- a/base/android/base_jni_registrar.cc
+++ b/base/android/base_jni_registrar.cc
@@ -5,24 +5,21 @@
 #include "base/android/base_jni_registrar.h"
 
 #include "base/basictypes.h"
+#include "base/message_pump_android.h"
 #include "base/android/build_info.h"
-#include "base/android/locale_utils.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_registrar.h"
+#include "base/android/locale_utils.h"
 #include "base/android/path_utils.h"
 
 namespace base {
-bool RegisterSystemMessageHandler(JNIEnv* env);
-}
-
-namespace base {
 namespace android {
 
 static RegistrationMethod kBaseRegisteredMethods[] = {
-  { "BuildInfo", base::android::RegisterBuildInfo },
+  { "BuildInfo", base::android::BuildInfo::RegisterBindings },
   { "LocaleUtils", base::android::RegisterLocaleUtils },
   { "PathUtils", base::android::RegisterPathUtils },
-  { "SystemMessageHandler", base::RegisterSystemMessageHandler },
+  { "SystemMessageHandler", base::MessagePumpForUI::RegisterBindings },
 };
 
 bool RegisterJni(JNIEnv* env) {
diff --git a/base/android/build_info.cc b/base/android/build_info.cc
index e054508..e5860c0 100644
--- a/base/android/build_info.cc
+++ b/base/android/build_info.cc
@@ -64,7 +64,8 @@ void BuildInfo::set_java_exception_info(const std::string& info) {
   java_exception_info_ = strndup(info.c_str(), 1024);
 }
 
-bool RegisterBuildInfo(JNIEnv* env) {
+// static
+bool BuildInfo::RegisterBindings(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
diff --git a/base/android/build_info.h b/base/android/build_info.h
index 1ee09b9..895bf61 100644
--- a/base/android/build_info.h
+++ b/base/android/build_info.h
@@ -69,6 +69,8 @@ class BuildInfo {
 
   void set_java_exception_info(const std::string& info);
 
+  static bool RegisterBindings(JNIEnv* env);
+
  private:
   friend struct BuildInfoSingletonTraits;
 
@@ -91,8 +93,6 @@ class BuildInfo {
   DISALLOW_COPY_AND_ASSIGN(BuildInfo);
 };
 
-bool RegisterBuildInfo(JNIEnv* env);
-
 }  // namespace android
 }  // namespace base
 
diff --git a/base/message_pump_android.cc b/base/message_pump_android.cc
index 25f7fb7..2bc904af 100644
--- a/base/message_pump_android.cc
+++ b/base/message_pump_android.cc
@@ -132,8 +132,8 @@ void MessagePumpForUI::ScheduleDelayedWork(const TimeTicks& delayed_work_time) {
       g_system_message_handler_obj.Get().obj(), millis);
 }
 
-// Register native methods
-bool RegisterSystemMessageHandler(JNIEnv* env) {
+// static
+bool MessagePumpForUI::RegisterBindings(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
diff --git a/base/message_pump_android.h b/base/message_pump_android.h
index e10a770..e5066ae 100644
--- a/base/message_pump_android.h
+++ b/base/message_pump_android.h
@@ -6,6 +6,8 @@
 #define BASE_MESSAGE_PUMP_ANDROID_H_
 #pragma once
 
+#include <jni.h>
+
 #include "base/compiler_specific.h"
 #include "base/message_pump.h"
 #include "base/time.h"
@@ -18,7 +20,6 @@ class RunLoop;
 class MessagePumpForUI : public MessagePump {
  public:
   MessagePumpForUI();
-  virtual ~MessagePumpForUI();
 
   virtual void Run(Delegate* delegate) OVERRIDE;
   virtual void Quit() OVERRIDE;
@@ -27,6 +28,11 @@ class MessagePumpForUI : public MessagePump {
 
   virtual void Start(Delegate* delegate);
 
+  static bool RegisterBindings(JNIEnv* env);
+
+ protected:
+  virtual ~MessagePumpForUI();
+
  private:
   base::RunLoop* run_loop_;