content_shell: Move BrowserTestSystemMessageHandler and use it in layout tests for Android

content/test/content_test_launcher.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 "content/public/test/test_launcher.h"
 
 #include "base/base_paths.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/test/test_suite.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/content_test_suite_base.h"
 #include "content/shell/app/shell_main_delegate.h"
 #include "content/shell/common/shell_content_client.h"
 #include "content/shell/common/shell_switches.h"
 #include "content/shell/shell_content_browser_client.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_ANDROID)
 #include "base/message_loop.h"
-#include "content/test/browser_test_message_pump_android.h"
+#include "content/public/test/nested_message_pump_android.h"
 #endif
 
 #if defined(OS_WIN)
 #include "content/public/app/startup_helper_win.h"
 #include "sandbox/win/src/sandbox_types.h"
 #endif  // defined(OS_WIN)
 
 namespace content {
 
 class ContentShellTestSuiteInitializer
@@ skipping 17 matching lines @@
 
  private:
   scoped_ptr<ShellContentClient> content_client_;
   scoped_ptr<ShellContentBrowserClient> browser_content_client_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentShellTestSuiteInitializer);
 };
 
 #if defined(OS_ANDROID)
 base::MessagePump* CreateMessagePumpForUI() {
-  return new BrowserTestMessagePumpAndroid();
+  return new NestedMessagePumpAndroid();
 };
 #endif
 
 class ContentBrowserTestSuite : public ContentTestSuiteBase {
  public:
   ContentBrowserTestSuite(int argc, char** argv)
       : ContentTestSuiteBase(argc, argv) {
   }
   virtual ~ContentBrowserTestSuite() {
   }
@@ skipping 55 matching lines @@
  private:
   DISALLOW_COPY_AND_ASSIGN(ContentTestLauncherDelegate);
 };
 
 }  // namespace content
 
 int main(int argc, char** argv) {
   content::ContentTestLauncherDelegate launcher_delegate;
   return LaunchTests(&launcher_delegate, argc, argv);
 }