✈ Remove unnecessary flag and DocumentModeManager.

chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/DocumentModeAssassinTest.java

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.tabmodel;
 
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.test.MoreAsserts;
 import android.test.suitebuilder.annotation.MediumTest;
 import android.test.suitebuilder.annotation.SmallTest;
 
 import org.chromium.base.ContextUtils;
 import org.chromium.base.Log;
 import org.chromium.base.StreamUtil;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.util.AdvancedMockContext;
 import org.chromium.chrome.browser.TabState;
-import org.chromium.chrome.browser.preferences.DocumentModeManager;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tabmodel.DocumentModeAssassin.DocumentModeAssassinForTesting;
 import org.chromium.chrome.browser.tabmodel.DocumentModeAssassin.DocumentModeAssassinObserver;
 import org.chromium.chrome.browser.tabmodel.TabPersistentStoreTest.MockTabPersistentStoreObserver;
 import org.chromium.chrome.browser.tabmodel.TabPersistentStoreTest.TestTabModelSelector;
 import org.chromium.chrome.browser.tabmodel.TestTabModelDirectory.TabStateInfo;
 import org.chromium.chrome.browser.tabmodel.document.ActivityDelegate;
 import org.chromium.chrome.browser.tabmodel.document.DocumentTabModel;
 import org.chromium.chrome.browser.tabmodel.document.DocumentTabModelImpl;
 import org.chromium.chrome.browser.tabmodel.document.MockDocumentTabModel;
@@ skipping 336 matching lines @@
         mFinishAllDocumentActivitiesCallback.waitForCallback(0);
         changeDoneCallback.waitForCallback(0);
         confirmUserIsInTabbedMode();
     }
 
     private void confirmUserIsInTabbedMode() {
         // Check that the preference was written out correctly.
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
-                assertEquals(DocumentModeManager.OPTED_OUT_OF_DOCUMENT_MODE,
-                        DocumentModeManager.getInstance(mContext).getOptOutStateForTesting());
+                assertTrue(DocumentModeAssassin.isOptedOutOfDocumentMode());
             }
         });
     }
 
     /**
      * Tests that the {@link DocumentTabModel}'s data is properly saved out for a
      * {@link TabModelImpl}.
      */
     @MediumTest
     public void testWriteTabModelMetadata() throws Exception {
@@ skipping 268 matching lines @@
             mDocumentModeDirectory.writeTabStateFile(TAB_STATE_INFO[i]);
         }
 
         // Write out some random files that should have been ignored by migration.
         writeUselessFileToDirectory(mDocumentModeDirectory.getDataDirectory(), "ignored.file");
         writeUselessFileToDirectory(mDocumentModeDirectory.getDataDirectory(),
                 TabState.SAVED_TAB_STATE_FILE_PREFIX + "_unparseable");
 
     }
 }