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

content/public/test/android/javatests/src/org/chromium/content/browser/test/NestedSystemMessageHandler.java

Index: content/public/test/android/javatests/src/org/chromium/content/browser/test/NestedSystemMessageHandler.java
diff --git a/content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/BrowserTestSystemMessageHandler.java b/content/public/test/android/javatests/src/org/chromium/content/browser/test/NestedSystemMessageHandler.java
similarity index 94%
rename from content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/BrowserTestSystemMessageHandler.java
rename to content/public/test/android/javatests/src/org/chromium/content/browser/test/NestedSystemMessageHandler.java
index 2ba7e9435c86bc67615bda67095797f6d32b4551..effeb0e24e727a25171539773290892d9e397ad3 100644
--- a/content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/BrowserTestSystemMessageHandler.java
+++ b/content/public/test/android/javatests/src/org/chromium/content/browser/test/NestedSystemMessageHandler.java
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.content_browsertests_apk;
+package org.chromium.content.browser.test;
 
 import android.os.Handler;
 import android.os.Looper;
@@ -24,13 +24,13 @@ import java.lang.reflect.InvocationTargetException;
  * and dispatch them.
  */
 @JNINamespace("content")
-class BrowserTestSystemMessageHandler {
+class NestedSystemMessageHandler {
     // See org.chromium.base.SystemMessageHandler for more message ids.
     // The id here should not conflict with the ones in SystemMessageHandler.
     private static final int QUIT_MESSAGE = 10;
     private static final Handler mHandler = new Handler();
 
-    private BrowserTestSystemMessageHandler() {
+    private NestedSystemMessageHandler() {
     }
 
     /**
@@ -122,7 +122,7 @@ class BrowserTestSystemMessageHandler {
 
     @SuppressWarnings("unused")
     @CalledByNative
-    private static BrowserTestSystemMessageHandler create() {
-        return new BrowserTestSystemMessageHandler();
+    private static NestedSystemMessageHandler create() {
+        return new NestedSystemMessageHandler();
     }
 }