Add pathway to auto-migrate users when Chrome launches

chrome/android/java/src/org/chromium/chrome/browser/document/ChromeLauncherActivity.java

Index: chrome/android/java/src/org/chromium/chrome/browser/document/ChromeLauncherActivity.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/document/ChromeLauncherActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/document/ChromeLauncherActivity.java
index c314adfb61a9e6bbd69638f688e2b967ffcac936..d175dc4ae8dbcf1ca93b0545b6addef55ff6d5fc 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/document/ChromeLauncherActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/document/ChromeLauncherActivity.java
@@ -59,6 +59,7 @@ import org.chromium.chrome.browser.preferences.DocumentModeManager;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tab.TabIdManager;
 import org.chromium.chrome.browser.tabmodel.AsyncTabParamsManager;
+import org.chromium.chrome.browser.tabmodel.DocumentModeAssassin;
 import org.chromium.chrome.browser.tabmodel.document.ActivityDelegate;
 import org.chromium.chrome.browser.tabmodel.document.AsyncTabCreationParams;
 import org.chromium.chrome.browser.tabmodel.document.DocumentTabModel;
@@ -217,13 +218,6 @@ public class ChromeLauncherActivity extends Activity
             return;
         }
 
-        // Check if we're just closing all of the Incognito tabs.
-        if (TextUtils.equals(intent.getAction(), ACTION_CLOSE_ALL_INCOGNITO)) {
-            ChromeApplication.getDocumentTabModelSelector().getModel(true).closeAllTabs();
-            ApiCompatibilityUtils.finishAndRemoveTask(this);
-            return;
-        }
-
         // Check if we should launch the FirstRunActivity.  This occurs after the check to launch
         // ChromeTabbedActivity because ChromeTabbedActivity handles FRE in its own way.
         if (launchFirstRunExperience()) return;
@@ -234,8 +228,23 @@ public class ChromeLauncherActivity extends Activity
             return;
         }
 
-        // Launch a DocumentActivity to handle the Intent.
-        handleDocumentActivityIntent();
+        if (DocumentModeAssassin.isMigrationNecessary()) {
+            Log.d(TAG, "Diverting to UpgradeActivity via ChromeLauncherActivity.");
+            UpgradeActivity.launchInstance(this, intent);
+            finish();

[Ted C, 2016/03/25 17:38:05]

ApiCompatibilityUtils.finishAndRemoveTask(this); ?  I honestly don't know why
we'd use one over the other.

[gone, 2016/03/25 22:05:41]

We use finish when something sits on top of this Activity, I think.  I'm not
sure if it makes a difference in this case, but I switched over.

+            return;
+        } else {
+            // Check if we're just closing all of the Incognito tabs.
+            if (TextUtils.equals(intent.getAction(), ACTION_CLOSE_ALL_INCOGNITO)) {
+                ChromeApplication.getDocumentTabModelSelector().getModel(true).closeAllTabs();
+                ApiCompatibilityUtils.finishAndRemoveTask(this);
+                return;
+            }
+
+            // Launch a DocumentActivity to handle the Intent.
+            handleDocumentActivityIntent();
+        }
+
         if (!mIsFinishDelayed) ApiCompatibilityUtils.finishAndRemoveTask(this);
     }