Force first backup

chrome/android/java/src/org/chromium/chrome/browser/ChromeBackupWatcher.java

Index: chrome/android/java/src/org/chromium/chrome/browser/ChromeBackupWatcher.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackupWatcher.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackupWatcher.java
index 554b054c57e220a5432cff9127047d3ebf4d800e..e3477ceb7fcffc3c12dd863afa0f5ce65393117d 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackupWatcher.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackupWatcher.java
@@ -22,6 +22,8 @@ import org.chromium.components.signin.ChromeSigninController;
 public class ChromeBackupWatcher {
     private BackupManager mBackupManager;
 
+    private static final String FIRST_BACKUP_DONE = "first_backup_done";
+
     @VisibleForTesting
     @CalledByNative
     static ChromeBackupWatcher createChromeBackupWatcher() {
@@ -35,6 +37,11 @@ public class ChromeBackupWatcher {
         mBackupManager = new BackupManager(context);
         // Watch the Java preferences that are backed up.
         SharedPreferences sharedPrefs = ContextUtils.getAppSharedPreferences();
+        // If we have never done a backup do one immediately.
+        if (!sharedPrefs.getBoolean(FIRST_BACKUP_DONE, false)) {
+            mBackupManager.dataChanged();
+            sharedPrefs.edit().putBoolean(FIRST_BACKUP_DONE, true).apply();

[Bernhard Bauer, 2016/11/17 16:08:32]

Actually, would it make sense to set this flag as well when restoring a backup?

[aberent, 2016/11/17 16:58:54]

First run on a new device will always change some of the things we watch so will
always request a backup anyway. I found it much easier to do a silent first run
to set up the user rather than trying to restore everything that user signin
changes, and this silent first run changes some of the preferences we watch (in
particular, to force this, we restore the original SIGNED_IN_ACCOUNT_KEY to the
FIRST_RUN_FLOW_SIGNIN_ACCOUNT_NAME, the silent first run will then restore the
SIGNED_IN_ACCOUNT_KEY). Avoiding this would have been complex, and the cost of
the current behaviour is small (and it only happens once per device).

+        }
         sharedPrefs.registerOnSharedPreferenceChangeListener(
                 new SharedPreferences.OnSharedPreferenceChangeListener() {