✈ Remove unnecessary flag and DocumentModeManager.

chrome/android/java/src/org/chromium/chrome/browser/webapps/FullScreenActivity.java

 // Copyright 2015 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.webapps;
 
 import android.content.Intent;
 import android.view.View;
 import android.view.ViewGroup;
 
-import org.chromium.base.Log;
-import org.chromium.base.StreamUtil;
 import org.chromium.base.annotations.SuppressFBWarnings;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.TabState;
 import org.chromium.chrome.browser.compositor.layouts.LayoutManagerDocument;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tab.TabDelegateFactory;
 import org.chromium.chrome.browser.tab.TabUma.TabCreationState;
 import org.chromium.chrome.browser.tabmodel.SingleTabModelSelector;
 import org.chromium.chrome.browser.tabmodel.TabModel.TabLaunchType;
 import org.chromium.chrome.browser.tabmodel.TabModel.TabSelectionType;
 import org.chromium.chrome.browser.tabmodel.document.TabDelegate;
 import org.chromium.chrome.browser.widget.ControlContainer;
 import org.chromium.content_public.browser.LoadUrlParams;
 import org.chromium.content_public.browser.WebContentsObserver;
 
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
 
 /**
  * Base class for task-focused activities that need to display web content in a nearly UI-less
  * Chrome (InfoBars still appear).
  *
  * This is vaguely analogous to a WebView, but in Chrome. Example applications that might use this
  * Activity would be webapps and streaming media activities - anything where user interaction with
  * the regular browser's UI is either unnecessary or undesirable.
  * Subclasses can override {@link #createUI()} if they need something more exotic.
  */
@@ skipping 71 matching lines @@
         boolean unfreeze = false;
 
         int tabId = Tab.INVALID_TAB_ID;
         String tabUrl = null;
         if (getSavedInstanceState() != null) {
             tabId = getSavedInstanceState().getInt(BUNDLE_TAB_ID, Tab.INVALID_TAB_ID);
             tabUrl = getSavedInstanceState().getString(BUNDLE_TAB_URL);
         }
 
         if (tabId != Tab.INVALID_TAB_ID && tabUrl != null && getActivityDirectory() != null) {
-            FileInputStream stream = null;
-            try {
-                // Restore the tab.
-                stream = new FileInputStream(getTabFile(getActivityDirectory(), tabId));
-                TabState tabState = TabState.readState(stream, false);
-                tab = new Tab(tabId, Tab.INVALID_TAB_ID, false, this, getWindowAndroid(),
-                        TabLaunchType.FROM_RESTORE,
-                        TabCreationState.FROZEN_ON_RESTORE, tabState);
-                unfreeze = true;
-            } catch (FileNotFoundException exception) {
-                Log.e(TAG, "Failed to restore tab state.", exception);
-            } catch (IOException exception) {
-                Log.e(TAG, "Failed to restore tab state.", exception);
-            } finally {
-                StreamUtil.closeQuietly(stream);
-            }
+            // Restore the tab.
+            TabState tabState = TabState.restoreTabState(getActivityDirectory(), tabId);
+            tab = new Tab(tabId, Tab.INVALID_TAB_ID, false, this, getWindowAndroid(),
+                    TabLaunchType.FROM_RESTORE,
+                    TabCreationState.FROZEN_ON_RESTORE, tabState);
+            unfreeze = true;
         }
 
         if (tab == null) {
             tab = new Tab(Tab.INVALID_TAB_ID, Tab.INVALID_TAB_ID, false, this, getWindowAndroid(),
                     TabLaunchType.FROM_CHROME_UI, null, null);
         }
 
         tab.initialize(null, getTabContentManager(), createTabDelegateFactory(), false, unfreeze);
         mWebContentsObserver = new WebContentsObserver(tab.getWebContents()) {
             @Override
@@ skipping 17 matching lines @@
         return new FullScreenDelegateFactory();
     }
 
     /**
      * @return {@link File} pointing at a directory specific for this class.
      */
     protected File getActivityDirectory() {
         return null;
     }
 
-    /**
-     * @return {@link File} pointing at the tab state for this Activity.
-     */
-    protected static File getTabFile(File activityDirectory, int tabId) {
-        return new File(activityDirectory, TabState.getTabStateFilename(tabId, false));
-    }
-
     @Override
     protected boolean handleBackPressed() {
         if (mTab == null) return false;
         if (mTab.canGoBack()) {
             mTab.goBack();
             return true;
         }
         return false;
     }
 
     @Override
     public void onCheckForUpdate(boolean updateAvailable) {
     }
 }