Convert ChromeSyncShell to use ChromePublic infrastructure

chrome/android/sync_shell/javatests/AndroidManifest.xml

Index: chrome/android/sync_shell/javatests/AndroidManifest.xml
diff --git a/chrome/android/sync_shell/javatests/AndroidManifest.xml b/chrome/android/sync_shell/javatests/AndroidManifest.xml
index 2b063ec1e40c4fc40c2010c5491548f78aa1e667..fd2d65915f6d3209a44b3f98f2d7ad41684a57dd 100644
--- a/chrome/android/sync_shell/javatests/AndroidManifest.xml
+++ b/chrome/android/sync_shell/javatests/AndroidManifest.xml
@@ -1,30 +1,75 @@
 <?xml version="1.0" encoding="utf-8"?>
-  <!-- Copyright (c) 2012 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.sync_shell.tests">
+<!-- Copyright 2015 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. -->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.chromium.chrome.sync_shell.tests">
+
     <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="22" />
-    <uses-permission android:name="android.permission.RUN_INSTRUMENTATION" />
     <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" />
-    <!-- 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. -->
-    <application>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.INTERNET" />
+
+    <application
+        android:label="ChromeSyncShellTest">
+
         <uses-library android:name="android.test.runner" />
+
+        <provider android:name="org.chromium.chrome.test.TestContentProvider"

[newt (away), 2015/08/11 21:25:29]

Remove all the providers, activities, receivers, etc that aren't used by the
tests in sync_shell. Having the same providers here as in ChromePublicTest, will
prevent ChromeShellTest.apk and ChromePublicTest.apk from being installed
side-by-side (which will break the bots).

Having duplicated activities and receivers won't cause problems, but it's unused
and unnecessary duplicated code.

[pval...(no longer on Chromium), 2015/08/14 21:51:10]

Done. I think I had just copied over the ChromePublicTest manifest file (to get
things working initially) and never cleaned it back up.

+            android:authorities="org.chromium.chrome.test.TestContentProvider"
+            android:exported="true" />
+
+        <provider android:name="org.chromium.chrome.test.partnercustomizations.TestPartnerBrowserCustomizationsProvider"
+            android:authorities="org.chromium.chrome.test.partnercustomizations.TestPartnerBrowserCustomizationsProvider"
+            android:exported="true" />
+        <provider android:name="org.chromium.chrome.test.partnercustomizations.TestPartnerBrowserCustomizationsDelayedProvider"
+            android:authorities="org.chromium.chrome.test.partnercustomizations.TestPartnerBrowserCustomizationsDelayedProvider"
+            android:exported="true" />
+
         <activity android:name="org.chromium.sync.test.util.MockGrantCredentialsPermissionActivity"
-            android:exported="false">
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
+
+        <activity android:name="org.chromium.chrome.browser.customtabs.CustomTabExternalNavigationTest$DummyActivityForSpecialScheme"
+            android:exported="true" >
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:host="customtabtest" android:scheme="customtab" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="org.chromium.chrome.browser.customtabs.CustomTabExternalNavigationTest$DummyActivityForHttp"
+            android:exported="true" >
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:host="customtabtest.com" android:scheme="http" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="org.chromium.test.broker.OnDeviceInstrumentationBroker"
+            android:exported="true"/>
+        <!--suppress ExportedReceiver -->
+        <receiver android:name="org.chromium.chrome.browser.customtabs.CustomTabsActivityTest$DummyBroadcastReceiver">
+            <intent-filter>
+                <action android:name="org.chromium.chrome.browser.customtabs.TEST_PENDING_INTENT_SENT" >
+                </action>
+            </intent-filter>
+        </receiver>
     </application>
+
     <instrumentation android:name="org.chromium.chrome.test.ChromeInstrumentationTestRunner"
-        android:targetPackage="org.chromium.chrome.sync_shell"
-        android:label="Tests for org.chromium.chrome.sync_shell"/>
+        android:targetPackage="{{manifest_package}}"
+        android:label="Tests for {{manifest_package}}"/>
 </manifest>