Updating message pump to store java ptr in class

base/message_loop/message_pump_android.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 "base/message_loop/message_pump_android.h"
 
 #include <jni.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/run_loop.h"
 #include "base/time/time.h"
 #include "jni/SystemMessageHandler_jni.h"
 
 using base::android::ScopedJavaLocalRef;
 
-namespace {
-
-base::LazyInstance<base::android::ScopedJavaGlobalRef<jobject> >
-    g_system_message_handler_obj = LAZY_INSTANCE_INITIALIZER;
-
-}  // namespace
-
 // ----------------------------------------------------------------------------
 // Native JNI methods called by Java.
 // ----------------------------------------------------------------------------
 // This method can not move to anonymous namespace as it has been declared as
 // 'static' in system_message_handler_jni.h.
 static jboolean DoRunLoopOnce(JNIEnv* env, jobject obj, jint native_delegate) {
   base::MessagePump::Delegate* delegate =
       reinterpret_cast<base::MessagePump::Delegate*>(native_delegate);
   DCHECK(delegate);
   // This is based on MessagePumpForUI::DoRunLoop() from desktop.
@@ skipping 38 matching lines @@
       " test_stub_android.h";
 }
 
 void MessagePumpForUI::Start(Delegate* delegate) {
   run_loop_ = new RunLoop();
   // Since the RunLoop was just created above, BeforeRun should be guaranteed to
   // return true (it only returns false if the RunLoop has been Quit already).
   if (!run_loop_->BeforeRun())
     NOTREACHED();
 
-  DCHECK(g_system_message_handler_obj.Get().is_null());
+  DCHECK(system_message_handler_obj_.is_null());
 
   JNIEnv* env = base::android::AttachCurrentThread();
   DCHECK(env);
 
-  g_system_message_handler_obj.Get().Reset(
+  system_message_handler_obj_.Reset(
       Java_SystemMessageHandler_create(env, reinterpret_cast<jint>(delegate)));
 }
 
 void MessagePumpForUI::Quit() {
-  if (!g_system_message_handler_obj.Get().is_null()) {
+  if (!system_message_handler_obj_.is_null()) {
     JNIEnv* env = base::android::AttachCurrentThread();
     DCHECK(env);
 
     Java_SystemMessageHandler_removeTimer(env,
-        g_system_message_handler_obj.Get().obj());
-    g_system_message_handler_obj.Get().Reset();
+        system_message_handler_obj_.obj());
+    system_message_handler_obj_.Reset();
   }
 
   if (run_loop_) {
     run_loop_->AfterRun();
     delete run_loop_;
     run_loop_ = NULL;
   }
 }
 
 void MessagePumpForUI::ScheduleWork() {
-  DCHECK(!g_system_message_handler_obj.Get().is_null());
+  DCHECK(!system_message_handler_obj_.is_null());
 
   JNIEnv* env = base::android::AttachCurrentThread();
   DCHECK(env);
 
   Java_SystemMessageHandler_setTimer(env,
-      g_system_message_handler_obj.Get().obj());
+      system_message_handler_obj_.obj());
 }
 
 void MessagePumpForUI::ScheduleDelayedWork(const TimeTicks& delayed_work_time) {
-  DCHECK(!g_system_message_handler_obj.Get().is_null());
+  DCHECK(!system_message_handler_obj_.is_null());
 
   JNIEnv* env = base::android::AttachCurrentThread();
   DCHECK(env);
 
   jlong millis =
       (delayed_work_time - TimeTicks::Now()).InMillisecondsRoundedUp();
   // Note that we're truncating to milliseconds as required by the java side,
   // even though delayed_work_time is microseconds resolution.
   Java_SystemMessageHandler_setDelayedTimer(env,
-      g_system_message_handler_obj.Get().obj(), millis);
+      system_message_handler_obj_.obj(), millis);
 }
 
 // static
 bool MessagePumpForUI::RegisterBindings(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace base