Revert 212948 "Made MessagePump a non-thread safe class."

trunk/src/base/test/test_support_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 <stdarg.h>
 #include <string.h>
 
 #include "base/android/path_utils.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
@@ skipping 54 matching lines @@
       : waitable_event_(false, false) {
   }
 
   base::WaitableEvent waitable_event_;
 
   DISALLOW_COPY_AND_ASSIGN(Waitable);
 };
 
 // The MessagePumpForUI implementation for test purpose.
 class MessagePumpForUIStub : public base::MessagePumpForUI {
-  virtual ~MessagePumpForUIStub() {}
-
   virtual void Start(base::MessagePump::Delegate* delegate) OVERRIDE {
     NOTREACHED() << "The Start() method shouldn't be called in test, using"
         " Run() method should be used.";
   }
 
   virtual void Run(base::MessagePump::Delegate* delegate) OVERRIDE {
     // The following was based on message_pump_glib.cc, except we're using a
     // WaitableEvent since there are no native message loop to use.
     RunState state(delegate, g_state ? g_state->run_depth + 1 : 1);
 
@@ skipping 37 matching lines @@
   }
 
   virtual void ScheduleWork() OVERRIDE {
     Waitable::GetInstance()->Signal();
   }
 
   virtual void ScheduleDelayedWork(
       const base::TimeTicks& delayed_work_time) OVERRIDE {
     Waitable::GetInstance()->Signal();
   }
+
+ protected:
+  virtual ~MessagePumpForUIStub() {}
 };
 
 base::MessagePump* CreateMessagePumpForUIStub() {
   return new MessagePumpForUIStub();
 };
 
 // Provides the test path for DIR_MODULE and DIR_ANDROID_APP_DATA.
 bool GetTestProviderPath(int key, base::FilePath* result) {
   switch (key) {
     case base::DIR_MODULE: {
@@ skipping 39 matching lines @@
   if (!MessageLoop::InitMessagePumpForUIFactory(&CreateMessagePumpForUIStub))
     LOG(INFO) << "MessagePumpForUIFactory already set, unable to override.";
 }
 
 void InitAndroidTest() {
   InitAndroidTestLogging();
   InitAndroidTestPaths();
   InitAndroidTestMessageLoop();
 }
 }  // namespace base