Implement Android key/value backup

chrome/android/java/AndroidManifest.xml

Index: chrome/android/java/AndroidManifest.xml
diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
index aeeeb2cc6c5215fed8eaeeaea51d34aa69b6ca96..3fb519c8574eabd708a7405b916d63c423b598fe 100644
--- a/chrome/android/java/AndroidManifest.xml
+++ b/chrome/android/java/AndroidManifest.xml
@@ -112,15 +112,16 @@ by a child template that "extends" this file.
         android:icon="@mipmap/app_icon"
         android:label="@string/app_name"
         android:largeHeap="false"
-        android:allowBackup="false"
         android:manageSpaceActivity="@string/manage_space_activity"
-        android:fullBackupContent="@xml/chromebackupscheme"
+        android:supportsRtl="true"
+        {% if backup_key is defined %}
+        android:allowBackup="true"
+        android:backupAgent="org.chromium.chrome.browser.ChromeBackupAgent"
         android:fullBackupOnly="false"
         android:restoreAnyVersion="true"
-        {% block android_backup_agent %}
-        android:backupAgent="org.chromium.chrome.browser.ChromeBackupAgent"
-        {% endblock %}
-        android:supportsRtl="true"
+        {% else %}
+        android:allowBackup="false"
+        {% endif %}
         {% if target_sdk_version|int >= 24 %}
         android:networkSecurityConfig="@xml/network_security_config"
         {% endif %}
@@ -136,12 +137,19 @@ by a child template that "extends" this file.
         <meta-data android:name="com.samsung.android.sdk.multiwindow.penwindow.enable"
             android:value="true"/>
 
+        {% if backup_key is defined %}
+        <!-- Backup keys are channel dependent -->
+        <meta-data android:name="com.google.android.backup.api_key"
+            android:value="{{ backup_key }}" />
+        {% endif %}
+
         {% if channel in ['dev', 'canary', 'default'] %}
         <meta-data android:name="com.sec.android.support.multiwindow" android:value="true" />
         {% endif %}
         <meta-data android:name="android.content.APP_RESTRICTIONS"
             android:resource="@xml/app_restrictions"/>
 
+        

[Bernhard Bauer, 2016/11/14 10:05:38]

Remove this line again?

[aberent, 2016/11/14 17:23:39]

Done.

         <!-- Note: All activities directly or indirectly derived from ChromeActivity
              must specify android:hardwareAccelerated="false".