DevTools socket tunnel.

components/devtools_bridge/android/javatests/AndroidManifest.xml

Index: components/devtools_bridge/android/javatests/AndroidManifest.xml
diff --git a/chrome/android/shell/javatests/AndroidManifest.xml b/components/devtools_bridge/android/javatests/AndroidManifest.xml
similarity index 50%
copy from chrome/android/shell/javatests/AndroidManifest.xml
copy to components/devtools_bridge/android/javatests/AndroidManifest.xml
index a9ed06d93bd738984f8e37d982fbd170e51da3ab..2478af15941f3f2ffa260aeeacf9eb19415b576c 100644
--- a/chrome/android/shell/javatests/AndroidManifest.xml
+++ b/components/devtools_bridge/android/javatests/AndroidManifest.xml
@@ -1,31 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
-  <!-- Copyright (c) 2012 The Chromium Authors. All rights reserved. Use of
+  <!-- Copyright 2014 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. -->
   <!-- package name must be unique so suffix with "tests" so package loader
        doesn't ignore this. -->
   <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="org.chromium.chrome.shell.tests">
-    <!-- We add an application tag here just so that we can indicate that this
-         package needs to link against the android.test library, which is
-         needed when building test cases. -->
+      package="org.chromium.components.devtools_bridge.tests">
     <application>
         <uses-library android:name="android.test.runner" />
-        <activity android:name="org.chromium.sync.test.util.MockGrantCredentialsPermissionActivity"
-            android:exported="false">
+        <service
+            android:name=".DebugService" >
+        </service>
+        <activity
+            android:name=".DebugActivity"
+            android:label="DevToolsBridge tests" >
             <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
     </application>
     <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="20" />
     <instrumentation android:name="android.test.InstrumentationTestRunner"
-        android:targetPackage="org.chromium.chrome.shell"
-        android:label="Tests for org.chromium.chrome.shell"/>
+        android:targetPackage="org.chromium.components.devtools_bridge.tests"
+        android:label="Tests for org.chromium.components.devtools_bridge"/>
+
     <uses-permission android:name="android.permission.RUN_INSTRUMENTATION" />
     <uses-permission android:name="android.permission.INJECT_EVENTS" />
-    <uses-permission android:name="android.permission.ACCESS_MOCK_LOCATION" />
-    <uses-permission android:name="android.permission.READ_LOGS"/>
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
+
+    <!-- For manual testing with Chrome Shell -->
+    <uses-permission android:name="org.chromium.chrome.shell.permission.DEBUG" />
+
+    <!-- For manual testing with Clankium -->
+    <uses-permission android:name="com.google.android.apps.chrome.permission.DEBUG" />
 </manifest>