NOT FOR REVIEW: Aura on Android

chrome/android/shell_aura/java/AndroidManifest.xml.jinja2

Index: chrome/android/shell_aura/java/AndroidManifest.xml.jinja2
diff --git a/chrome/android/sync_shell/java/AndroidManifest.xml.jinja2 b/chrome/android/shell_aura/java/AndroidManifest.xml.jinja2
similarity index 67%
copy from chrome/android/sync_shell/java/AndroidManifest.xml.jinja2
copy to chrome/android/shell_aura/java/AndroidManifest.xml.jinja2
index 5d82703fe7c627bd2a53f59b39ecb90fb7c09c30..a56e9ed94a69845a2c29e3f690f1e0ed17c3feb8 100644
--- a/chrome/android/sync_shell/java/AndroidManifest.xml.jinja2
+++ b/chrome/android/shell_aura/java/AndroidManifest.xml.jinja2
@@ -7,12 +7,15 @@
  -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.chromium.chrome.sync_shell">
+    package="org.chromium.chrome.shell">
 
     <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="22" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+    <uses-permission android:name="android.permission.BLUETOOTH"/>
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
+    <uses-feature android:name="android.hardware.bluetooth_le" android:required="false"/>
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.GET_ACCOUNTS"/>
     <uses-permission android:name="android.permission.INTERNET"/>
@@ -26,14 +29,20 @@
     <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.sync_shell.permission.C2D_MESSAGE"
+    <permission android:name="org.chromium.chrome.shell.permission.C2D_MESSAGE"
                 android:protectionLevel="signature" />
-    <uses-permission android:name="org.chromium.chrome.sync_shell.permission.C2D_MESSAGE" />
+    <uses-permission android:name="org.chromium.chrome.shell.permission.C2D_MESSAGE" />
     <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
 
+    <permission android:name="org.chromium.chrome.shell.permission.DEBUG"
+                android:label="Debug web pages in Chrome Shell"
+                android:permissionGroup="android.permission-group.DEVELOPMENT_TOOLS"
+                android:protectionLevel="signature" />
+
     <application android:name="org.chromium.chrome.shell.ChromeShellApplication"
             android:icon="@mipmap/app_icon"
-            android:label="Chrome Sync Shell">
+            android:label="@string/app_name"
+            android:supportsRtl="true">
         <activity android:name="org.chromium.chrome.shell.ChromeShellActivity"
                   android:launchMode="singleTask"
                   android:theme="@style/MainTheme"
@@ -42,19 +51,14 @@
               <intent-filter>
                   <action android:name="android.intent.action.MAIN" />
                   <category android:name="android.intent.category.LAUNCHER" />
+                  <category android:name="android.intent.category.NOTIFICATION_PREFERENCES" />
               </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. -->
 
-        <!-- NOTE: If you change the values of "android:process" for any of the below services,
+        <!-- NOTE: If you change the value of "android:process" for the below services,
              you also need to update kHelperProcessExecutableName in chrome_constants.cc. -->
         {% set num_sandboxed_services = 20 %}
         <meta-data android:name="org.chromium.content.browser.NUM_SANDBOXED_SERVICES"
@@ -76,22 +80,6 @@
                  android:exported="false" />
         {% endfor %}
 
-        <!-- 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.shell"/>
-            </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.components.invalidation.InvalidationClientService"/>
@@ -131,28 +119,5 @@
             </intent-filter>
         </receiver>
 
-        <provider android:name="org.chromium.chrome.browser.ChromeBrowserProvider"
-                  android:authorities="org.chromium.chrome.sync_shell"
-                  android:exported="true" />
-
-        <!-- Sync adapter for browser invalidation. -->
-        <service android:exported="false"
-                 android:name="org.chromium.chrome.shell.invalidation.ChromeShellSyncAdapterService">
-            <intent-filter>
-                <action android:name="android.content.SyncAdapter" />
-            </intent-filter>
-            <meta-data android:name="android.content.SyncAdapter"
-                       android:resource="@xml/syncadapter" />
-        </service>
-
-        <!-- Broadcast receiver that will be notified of account changes. -->
-        <receiver android:name="org.chromium.chrome.shell.signin.AccountsChangedReceiver">
-            <intent-filter>
-                <action android:name="android.accounts.LOGIN_ACCOUNTS_CHANGED" />
-            </intent-filter>
-        </receiver>
-        <meta-data android:name="org.chromium.content.browser.SMART_CLIP_PROVIDER"
-                   android:value="org.chromium.content.browser.SmartClipProvider" />
-
     </application>
 </manifest>