✈ Remove unnecessary flag and DocumentModeManager.

chrome/android/java/src/org/chromium/chrome/browser/tabmodel/DocumentModeAssassin.java

Index: chrome/android/java/src/org/chromium/chrome/browser/tabmodel/DocumentModeAssassin.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/DocumentModeAssassin.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/DocumentModeAssassin.java
index f3328c49529c66d67ec810cdaf48f0013d465d98..5766a8a8dff06f160ab7d9e5997ca0940cfbd6e9 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/DocumentModeAssassin.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/DocumentModeAssassin.java
@@ -24,7 +24,6 @@ import org.chromium.chrome.browser.document.DocumentActivity;
 import org.chromium.chrome.browser.document.DocumentUtils;
 import org.chromium.chrome.browser.document.IncognitoDocumentActivity;
 import org.chromium.chrome.browser.incognito.IncognitoNotificationManager;
-import org.chromium.chrome.browser.preferences.DocumentModeManager;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tabmodel.TabPersistentStore.TabModelMetadata;
 import org.chromium.chrome.browser.tabmodel.document.ActivityDelegate;
@@ -105,6 +104,12 @@ public class DocumentModeAssassin {
     /** Which TabModelSelectorImpl to copy files into during migration. */
     private static final int TAB_MODEL_INDEX = 0;
 
+    /** SharedPreference values to determine whether user had document mode turned on. */
+    private static final String OPT_OUT_STATE = "opt_out_state";
+    // (Unused) private static final int OPT_IN_TO_DOCUMENT_MODE = 0;

[gone, 2016/05/26 16:38:43]

Might as well just delete these.

[Peter Wen, 2016/05/26 19:13:56]

Done.

+    // (Unused) private static final int OPT_OUT_PROMO_DISMISSED = 1;
+    private static final int OPTED_OUT_OF_DOCUMENT_MODE = 2;
+
     /** Creates and holds the Singleton. */
     private static class LazyHolder {
         private static final DocumentModeAssassin INSTANCE = new DocumentModeAssassin();
@@ -364,8 +369,7 @@ public class DocumentModeAssassin {
         // Record that the user has opted-out of document mode now that their data has been
         // safely copied to the other directory.
         Log.d(TAG, "Setting tabbed mode preference.");
-        DocumentModeManager.getInstance(getContext()).setOptedOutState(
-                DocumentModeManager.OPTED_OUT_OF_DOCUMENT_MODE);
+        clearOptedOutState();
         TabSwitcherCallout.setIsTabSwitcherCalloutNecessary(getContext(), true);
 
         // Remove all the {@link DocumentActivity} tasks from Android's Recents list.  Users
@@ -545,4 +549,15 @@ public class DocumentModeAssassin {
     protected File getTabbedDataDirectory() {
         return TabPersistentStore.getOrCreateSelectorStateDirectory(TAB_MODEL_INDEX);
     }
-}
+
+    /** @return Whether the user set a preference to not use the document mode. */

[gone, 2016/05/26 16:38:43]

This comment doesn't make sense because it wasn't necessarily a user preference.

@return True if the user is not in document mode.

[Peter Wen, 2016/05/26 19:13:56]

Done.

+    public static boolean isOptedOutOfDocumentMode() {
+        return ContextUtils.getAppSharedPreferences().getInt(
+                OPT_OUT_STATE, OPTED_OUT_OF_DOCUMENT_MODE) == OPTED_OUT_OF_DOCUMENT_MODE;
+    }
+
+    /** Clears the opt out preference so that user doesn't migrate again. */
+    private void clearOptedOutState() {
+        ContextUtils.getAppSharedPreferences().edit().remove(OPT_OUT_STATE).apply();

[gone, 2016/05/26 16:38:43]

On its own, this does the exact opposite of the call you replaced.  Was this an
intentional change?  Are you implicitly relying on the default value of the
#getInt call above?

[Peter Wen, 2016/05/26 19:13:56]

Yep, assuming we make the change to the default value.

+    }
+}