Do not start RunLoop of MessagePumpForUI in NestedMessagePumpAndroid

content/public/test/nested_message_pump_android.cc

 // Copyright 2013 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 "content/public/test/nested_message_pump_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
@@ skipping 29 matching lines @@
   bool should_quit;
 
   // Used to sleep until there is more work to do.
   base::WaitableEvent waitable_event;
 
   // The time at which we should call DoDelayedWork.
   base::TimeTicks delayed_work_time;
 };
 
 NestedMessagePumpAndroid::NestedMessagePumpAndroid()
-    : state_(NULL) {
+    : state_(NULL), redundant_quit_executed_(false) {
 }
 
 NestedMessagePumpAndroid::~NestedMessagePumpAndroid() {
 }
 
 void NestedMessagePumpAndroid::Run(Delegate* delegate) {
   RunState state(delegate, state_ ? state_->run_depth + 1 : 1);
   RunState* previous_state = state_;
   state_ = &state;
 
@@ skipping 55 matching lines @@
 
   state_ = previous_state;
 }
 
 void NestedMessagePumpAndroid::Start(
     base::MessagePump::Delegate* delegate) {
   JNIEnv* env = base::android::AttachCurrentThread();
   DCHECK(env);
   g_message_handler_obj.Get().Reset(
       Java_NestedSystemMessageHandler_create(env));
-
-  base::MessagePumpForUI::Start(delegate);
 }
 
 void NestedMessagePumpAndroid::Quit() {
   if (state_) {

[bulach, 2014/11/17 22:08:42]

it looks like redundant_quit_executed_ could be an internal detail here rather
than an API, no?

[Jaekyun Seok (inactive), 2014/11/18 03:10:06]

I will ignore the quit request in browser_main_runner instead of adding this new
API.

     state_->should_quit = true;
     state_->waitable_event.Signal();
     return;
+  } else {
+    redundant_quit_executed_ = true;
   }
-  base::MessagePumpForUI::Quit();
+}
+
+bool NestedMessagePumpAndroid::IsRedundantQuitExpected() {
+  // Redundant quit is allowed only once.
+  return !redundant_quit_executed_;
 }
 
 void NestedMessagePumpAndroid::ScheduleWork() {
   if (state_) {
     state_->waitable_event.Signal();
     return;
   }
-
-  base::MessagePumpForUI::ScheduleWork();
 }
 
 void NestedMessagePumpAndroid::ScheduleDelayedWork(
     const base::TimeTicks& delayed_work_time) {
   if (state_) {
     // We know that we can't be blocked on Wait right now since this method can
     // only be called on the same thread as Run, so we only need to update our
     // record of how long to sleep when we do sleep.
     state_->delayed_work_time = delayed_work_time;
     return;
   }
-
-  base::MessagePumpForUI::ScheduleDelayedWork(delayed_work_time);
 }
 
 // static
 bool NestedMessagePumpAndroid::RegisterJni(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace content