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

content/public/test/nested_message_pump_android.h

Index: content/public/test/nested_message_pump_android.h
diff --git a/content/test/browser_test_message_pump_android.h b/content/public/test/nested_message_pump_android.h
similarity index 61%
rename from content/test/browser_test_message_pump_android.h
rename to content/public/test/nested_message_pump_android.h
index d19b4494effc531f62f144da39d3b86f4823f674..3fe2e8c61f7a1a0b8ffae2ec7d0c37c6a577c07d 100644
--- a/content/test/browser_test_message_pump_android.h
+++ b/content/public/test/nested_message_pump_android.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_TEST_BROWSER_TEST_MESSAGE_PUMP_ANDROID_
-#define CONTENT_TEST_BROWSER_TEST_MESSAGE_PUMP_ANDROID_
+#ifndef CONTENT_PUBLIC_TEST_NESTED_MESSAGE_PUMP_ANDROID_
+#define CONTENT_PUBLIC_TEST_NESTED_MESSAGE_PUMP_ANDROID_
 
 #include "base/android/jni_android.h"
 #include "base/compiler_specific.h"
@@ -11,11 +11,11 @@
 
 namespace content {
 
-// MessgePump to be used for content browsertests on Android.
-// This overrides the default ui message pump to allow nested loops.
-class BrowserTestMessagePumpAndroid : public base::MessagePumpForUI {
+// A nested message pump to be used for content browsertests and layout tests
+// on Android. It overrides the default UI message pump to allow nested loops.
+class NestedMessagePumpAndroid : public base::MessagePumpForUI {
  public:
-  BrowserTestMessagePumpAndroid();
+  NestedMessagePumpAndroid();
 
   virtual void Run(Delegate* delegate) OVERRIDE;
   virtual void Quit() OVERRIDE;
@@ -27,7 +27,7 @@ class BrowserTestMessagePumpAndroid : public base::MessagePumpForUI {
   static bool RegisterJni(JNIEnv* env);
 
  protected:
-  virtual ~BrowserTestMessagePumpAndroid();
+  virtual ~NestedMessagePumpAndroid();
 
  private:
   // We may make recursive calls to Run, so we save state that needs to be
@@ -36,9 +36,9 @@ class BrowserTestMessagePumpAndroid : public base::MessagePumpForUI {
 
   RunState* state_;
 
-  DISALLOW_COPY_AND_ASSIGN(BrowserTestMessagePumpAndroid);
+  DISALLOW_COPY_AND_ASSIGN(NestedMessagePumpAndroid);
 };
 
 }  // namespace content
 
-#endif  // CONTENT_TEST_BROWSER_TEST_MESSAGE_PUMP_ANDROID_
+#endif  // CONTENT_PUBLIC_TEST_NESTED_MESSAGE_PUMP_ANDROID_