Revamped EngineInitializer

Also contains gyp changes to add a instrumentation test
target for Browser

Change-Id: I2ea26a4a57d9101c54f80f148c9333088016e141
diff --git a/swe_android_browser.gypi b/swe_android_browser.gypi
index ce875e5..0a6dca5 100644
--- a/swe_android_browser.gypi
+++ b/swe_android_browser.gypi
@@ -1,6 +1,7 @@
 {
   'variables' : {
     'manifest_package_name%' : 'org.codeaurora.swe.browser.beta',
+    'manifest_test_package_name%' : 'org.codeaurora.swe.browser.beta.tests',
   },
   'targets' : [
     {
@@ -84,5 +85,33 @@
       },
       'includes': [ '../../build/android/jinja_template.gypi' ],
     },
+    {
+      'target_name': 'swe_android_browser_fake_apk',
+      'type': 'none',
+      'dependencies': [
+        'swe_android_browser_apk',
+      ],
+      'includes': [ '../../build/apk_fake_jar.gypi' ],
+    },
+
+    {
+      'target_name': 'swe_android_browser_tests_apk',
+        'type': 'none',
+        'dependencies': [
+          'swe_android_browser_fake_apk',
+          '../base/base.gyp:base_java_test_support',
+          '../content/content_shell_and_tests.gyp:content_java_test_support',
+          '../net/net.gyp:net_java_test_support',
+        ],
+        'variables': {
+          'apk_name': 'SWEBrowserTests',
+          'override_package_name': '<(manifest_test_package_name)',
+          'android_manifest_path': './tests/AndroidManifest.xml',
+          'java_in_dir': './tests/startup',
+          'is_test_apk': 1,
+          'test_suite_name': 'swe_android_browser_tests',
+        },
+        'includes': [ '../../build/java_apk.gypi' ],
+    },
   ],
 }