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 73d0790a35e3157b6e866faec6d0699c75c81b5d..eb83976b9d7bc210985e7f8a281e79b80c4c9ac5 100644
--- a/chrome/android/sync_shell/javatests/AndroidManifest.xml
+++ b/chrome/android/sync_shell/javatests/AndroidManifest.xml
@@ -1,23 +1,25 @@
 <?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">
-    <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23" />
-    <uses-permission android:name="android.permission.RUN_INSTRUMENTATION" />
+<!-- 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.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" />
+
         <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" />
@@ -25,6 +27,6 @@
         </activity>
     </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>