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

content/content_tests.gypi

Index: content/content_tests.gypi
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 6eb68cc9128646b05d6bc759b7453b9044ee011c..23ca7a3f06338549ac5fbfab99aa48d5d7f62fcd 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -27,6 +27,8 @@
         'public/test/browser_test_base.cc',
         'public/test/browser_test_base.h',
         'public/test/browser_test.h',
+        'public/test/browser_test_message_pump_android.cc',
+        'public/test/browser_test_message_pump_android.h',
         'public/test/browser_test_utils.cc',
         'public/test/browser_test_utils.h',
         'public/test/content_test_suite_base.cc',
@@ -231,6 +233,11 @@
             '../third_party/libvpx/libvpx.gyp:libvpx',
           ],
         }],
+        ['OS=="android"', {
+          'dependencies': [
+            'test_support_content_jni_headers',
+          ],
+        }],
       ],
     },
     {
@@ -843,8 +850,6 @@
             'renderer/savable_resources_browsertest.cc',
             'test/accessibility_browser_test_utils.cc',
             'test/accessibility_browser_test_utils.h',
-            'test/browser_test_message_pump_android.cc',
-            'test/browser_test_message_pump_android.h',
             'test/content_browser_test.h',
             'test/content_browser_test.cc',
             'test/content_browser_test_utils.cc',
@@ -1161,6 +1166,22 @@
     ['OS == "android"', {
       'targets': [
         {
+          'target_name': 'test_support_content_jni_headers',
+          'type': 'none',
+          'sources': [
+            'public/test/android/javatests/src/org/chromium/content/browser/test/BrowserTestSystemMessageHandler.java',
+          ],
+          'direct_dependent_settings': {
+            'include_dirs': [
+              '<(SHARED_INTERMEDIATE_DIR)/content/public/test',
+            ],
+          },
+          'variables': {
+            'jni_gen_package': 'content/public/test',
+          },
+          'includes': [ '../build/jni_generator.gypi' ],
+        },
+        {
           'target_name': 'content_java_test_support',
           'type': 'none',
           'dependencies': [