Revert 206507 "Move message_pump to base/message_loop."

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"
 #include "base/memory/singleton.h"
-#include "base/message_loop/message_loop.h"
-#include "base/message_loop/message_pump_android.h"
+#include "base/message_loop.h"
+#include "base/message_pump_android.h"
 #include "base/path_service.h"
 #include "base/synchronization/waitable_event.h"
 
 namespace {
 
 struct RunState {
   RunState(base::MessagePump::Delegate* delegate, int run_depth)
       : delegate(delegate),
         run_depth(run_depth),
         should_quit(false) {
@@ skipping 162 matching lines @@
   if (!MessageLoop::InitMessagePumpForUIFactory(&CreateMessagePumpForUIStub))
     LOG(INFO) << "MessagePumpForUIFactory already set, unable to override.";
 }
 
 void InitAndroidTest() {
   InitAndroidTestLogging();
   InitAndroidTestPaths();
   InitAndroidTestMessageLoop();
 }
 }  // namespace base