[Android backup] Restore nothing if signed in user isn't valid

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 858b3f3da8dc2df40f1ff8bec89a900d40868958..ca7c98f1cfac13f8467bc2a4c01eadfdb5abfa2b 100644
--- a/chrome/android/java/AndroidManifest.xml
+++ b/chrome/android/java/AndroidManifest.xml
@@ -102,10 +102,11 @@ by a child template that "extends" this file.
         android:label="@string/app_name"
         android:largeHeap="false"
         android:allowBackup="true"
-        android:backupAgent="org.chromium.chrome.browser.ChromeBackupAgent"
         android:fullBackupContent="@xml/chromebackupscheme"
         android:supportsRtl="true"
-        {% block extra_application_attributes %}{% endblock %}>
+        {% block extra_application_attributes %}

[Bernhard Bauer, 2016/05/23 12:40:15]

Using extra_application_attributes for this feels a bit brittle to me -- it
requires that the template extending this does *not* call super(), otherwise
things will break. We could just use a new, dedicated block for this.

[aberent, 2016/06/01 12:34:31]

Done.

+        android:backupAgent="org.chromium.chrome.browser.ChromeBackupAgent"
+        {% endblock %}>
 
         <!-- Samsung MultiWindow Support -->
         <meta-data android:name="com.samsung.android.sdk.multiwindow.enable"