Add more control over sync for Chromium testshell.

chrome/android/testshell/java/AndroidManifest.xml

Index: chrome/android/testshell/java/AndroidManifest.xml
diff --git a/chrome/android/testshell/java/AndroidManifest.xml b/chrome/android/testshell/java/AndroidManifest.xml
index 4d8f7a519783cba5294f6ea885107cc76756c35d..050e9db05fe32d559881208221ece55492ec5521 100644
--- a/chrome/android/testshell/java/AndroidManifest.xml
+++ b/chrome/android/testshell/java/AndroidManifest.xml
@@ -9,8 +9,27 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.chromium.chrome.testshell">
 
+    <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="17" />
     <permission android:name="org.chromium.chrome.testshell.permission.SANDBOX"
             android:protectionLevel="signature" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.GET_ACCOUNTS"/>

[shashi, 2013/08/30 05:30:31]

Why all these permissions?

Can we remove CAMERA, ACCESS_COARSE_LOCATION, ACCESS_NETWORK_STATE,
RECORD_AUDIO, MODIFY_AUDIO_SETTINGS, VIBRATE, etc.

[nyquist, 2013/08/30 05:45:35]

I would think they are for WebRTC, Geolocation, network change provider things,
WebRTC, media player, Vibrate API, etc. accordingly.

I just moved these around in this CL. I would like to not make any changes to
them in this CL, in case it breaks something.

+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
+    <uses-permission android:name="android.permission.RECORD_AUDIO"/>
+    <uses-permission android:name="android.permission.VIBRATE"/>
+    <uses-permission android:name="android.permission.WAKE_LOCK"/>
+    <uses-permission android:name="android.permission.READ_SYNC_SETTINGS"/>
+    <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
+    <uses-permission android:name="android.permission.USE_CREDENTIALS" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <!-- Only Chrome can receive the messages and registration result for GCM -->
+    <permission android:name="org.chromium.chrome.testshell.permission.C2D_MESSAGE"
+                android:protectionLevel="signature" />
+    <uses-permission android:name="org.chromium.chrome.testshell.permission.C2D_MESSAGE" />
+    <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
 
     <application android:name="org.chromium.chrome.testshell.ChromiumTestShellApplication"
             android:label="ChromiumTestShell">
@@ -25,6 +44,13 @@
                   <category android:name="android.intent.category.LAUNCHER" />
               </intent-filter>
          </activity>
+        <activity android:name="org.chromium.sync.test.util.MockGrantCredentialsPermissionActivity"
+                  android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
         <!-- The following service entries exist in order to allow us to
              start more than one sandboxed process. -->
 
@@ -96,6 +122,55 @@
                  android:isolatedProcess="true"
                  android:exported="false" />
 
+        <!-- Receiver for GCM messages. Rebroadcasts them locally for sync. -->
+        <receiver android:exported="true"
+                  android:name="com.google.ipc.invalidation.external.client.contrib.MultiplexingGcmListener$GCMReceiver"
+                  android:permission="com.google.android.c2dm.permission.SEND">
+            <intent-filter>
+                <action android:name="com.google.android.c2dm.intent.RECEIVE" />
+                <action android:name="com.google.android.c2dm.intent.REGISTRATION" />
+                <category android:name="org.chromium.chrome.testshell"/>
+            </intent-filter>
+        </receiver>
+        <service android:exported="false"
+                 android:name="com.google.ipc.invalidation.external.client.contrib.MultiplexingGcmListener">
+            <meta-data android:name="sender_ids"
+                       android:value="cloudprint.c2dm@gmail.com,ipc.invalidation@gmail.com"/>
+        </service>
+
+        <!-- Notification service for sync. -->
+        <meta-data android:name="ipc.invalidation.ticl.listener_service_class"
+                   android:value="org.chromium.sync.notifier.InvalidationService"/>
+        <service android:name="org.chromium.sync.notifier.InvalidationService"
+                 android:exported="false">
+            <intent-filter>
+                <action android:name="com.google.ipc.invalidation.AUTH_TOKEN_REQUEST"/>
+            </intent-filter>
+        </service>
+        <service android:exported="false"
+                 android:name="com.google.ipc.invalidation.ticl.android2.TiclService"/>
+        <service android:exported="false"
+                 android:name="com.google.ipc.invalidation.ticl.android2.channel.AndroidMessageSenderService"/>
+        <receiver android:exported="false"
+                  android:name="com.google.ipc.invalidation.ticl.android2.AndroidInternalScheduler$AlarmReceiver"/>
+        <receiver android:exported="false"
+                  android:name="com.google.ipc.invalidation.external.client.contrib.AndroidListener$AlarmReceiver"/>
+
+        <!-- Notification service multiplexed GCM receiver -->
+        <service android:exported="false"
+                 android:name="com.google.ipc.invalidation.ticl.android2.channel.AndroidMessageReceiverService"
+                 android:enabled="true"/>
+        <receiver android:exported="false"
+                  android:name="com.google.ipc.invalidation.ticl.android2.channel.AndroidMessageReceiverService$Receiver">
+            <intent-filter>
+                <action android:name="com.google.ipc.invalidation.gcmmplex.EVENT" />
+            </intent-filter>
+        </receiver>
+
+        <provider android:name="org.chromium.chrome.browser.ChromeBrowserProvider"
+                  android:authorities="org.chromium.chrome.testshell"

[shashi, 2013/08/30 05:30:31]

Why need this provider?

[nyquist, 2013/08/30 05:45:35]

The provider is needed to get the contract with Android working regarding having
a sync adapter.

There are several parts needed: A definition of the authority (package), the
sync adapter XML file, a syncadapter service, the syncadapter itself, and a
provider. Without a provider, the syncing does not work correctly.

+                  android:exported="true" />
+
         <!-- Sync adapter for browser sync. -->
         <service android:exported="false"
                  android:name="org.chromium.chrome.testshell.sync.ChromiumTestShellSyncAdapterService">
@@ -105,24 +180,5 @@
             <meta-data android:name="android.content.SyncAdapter"
                        android:resource="@xml/syncadapter" />
         </service>
-
-        <!-- Name of the class implementing the invalidation client, for sync notifications. -->
-        <meta-data android:name="org.chromium.sync.notifier.IMPLEMENTING_CLASS_NAME"
-                   android:value="org.chromium.sync.notifier.TEST_VALUE" />
     </application>
-
-    <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="17" />
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-    <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="android.permission.GET_ACCOUNTS"/>
-    <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
-    <uses-permission android:name="android.permission.RECORD_AUDIO"/>
-    <uses-permission android:name="android.permission.VIBRATE"/>
-    <uses-permission android:name="android.permission.WAKE_LOCK"/>
-    <uses-permission android:name="android.permission.READ_SYNC_SETTINGS"/>
-    <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
-    <uses-permission android:name="android.permission.USE_CREDENTIALS" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 </manifest>