Migrate TabPersistentStore to one shared directory for multi-instance

chrome/android/java/src/org/chromium/chrome/browser/incognito/IncognitoNotificationService.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.incognito;
 
 import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.ActivityManager;
 import android.app.ActivityManager.AppTask;
@@ skipping 16 matching lines @@
 import org.chromium.chrome.browser.ChromeTabbedActivity;
 import org.chromium.chrome.browser.TabState;
 import org.chromium.chrome.browser.document.ChromeLauncherActivity;
 import org.chromium.chrome.browser.document.DocumentUtils;
 import org.chromium.chrome.browser.tabmodel.TabPersistentStore;
 import org.chromium.chrome.browser.tabmodel.TabWindowManager;
 import org.chromium.chrome.browser.util.FeatureUtilities;
 
 import java.io.File;
 import java.lang.ref.WeakReference;
-import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.Callable;
 
 /**
  * Service that handles the action of clicking on the incognito notification.
  */
 public class IncognitoNotificationService extends IntentService {
 
@@ skipping 27 matching lines @@
         boolean clearedIncognito = true;
         if (isDocumentMode) {
             // TODO(dfalcantara): Delete this when document mode goes away.
             ThreadUtils.runOnUiThreadBlocking(new Runnable() {
                 @Override
                 public void run() {
                     ChromeApplication.getDocumentTabModelSelector().getModel(true).closeAllTabs();
                 }
             });
         } else {
-            List<Integer> processedSelectors = closeIncognitoTabsInRunningTabbedActivities();
+            closeIncognitoTabsInRunningTabbedActivities();
 
-            for (int i = 0; i < TabWindowManager.MAX_SIMULTANEOUS_SELECTORS; i++) {
-                if (processedSelectors.contains(i)) continue;
-                clearedIncognito &= deleteIncognitoStateFilesInDirectory(
-                        TabPersistentStore.getOrCreateSelectorStateDirectory(i));
-            }
+            clearedIncognito &= deleteIncognitoStateFilesInDirectory(

[Ted C, 2016/06/29 23:47:23]

this can just be = instead of &= since there are no longer any joining
conditions

[Theresa, 2016/06/30 00:02:51]

Done.

+                    TabPersistentStore.getOrCreateStateDirectory());
         }
 
         // If we failed clearing all of the incognito tabs, then do not dismiss the notification.
         if (!clearedIncognito) return;
 
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
                 int incognitoCount = TabWindowManager.getInstance().getIncognitoTabCount();
                 assert incognitoCount == 0;
@@ skipping 84 matching lines @@
                 visibleTaskIds.add(activity.getTaskId());
             }
         }
         return visibleTaskIds;
     }
 
     /**
      * Iterate across the running activities and for any running tabbed mode activities close their
      * incognito tabs.
      *
-     * @return The list of window indexes that were processed.
-     *
      * @see TabWindowManager#getIndexForWindow(Activity)
      */
-    private List<Integer> closeIncognitoTabsInRunningTabbedActivities() {
+    private Void closeIncognitoTabsInRunningTabbedActivities() {

[Ted C, 2016/06/29 23:47:23]

this should be lowercase void now

[Theresa, 2016/06/30 00:02:51]

Done.

         return ThreadUtils.runOnUiThreadBlockingNoException(

[Ted C, 2016/06/29 23:47:23]

remove the return and instead of Callable, use a Runnable

[Theresa, 2016/06/30 00:02:52]

Done.

-                new Callable<List<Integer>>() {
+                new Callable<Void>() {
                     @Override
-                    public List<Integer> call() {
-                        List<Integer> selectorIndexes = new ArrayList<>();
-
+                    public Void call() {
                         List<WeakReference<Activity>> runningActivities =
                                 ApplicationStatus.getRunningActivities();
                         for (int i = 0; i < runningActivities.size(); i++) {
                             Activity activity = runningActivities.get(i).get();
                             if (activity == null) continue;
                             if (!(activity instanceof ChromeTabbedActivity)) continue;
 
                             ChromeTabbedActivity tabbedActivity = (ChromeTabbedActivity) activity;
                             if (tabbedActivity.isActivityDestroyed()) continue;
 
                             tabbedActivity.getTabModelSelector().getModel(true).closeAllTabs(
                                     false, false);
-                            selectorIndexes.add(TabWindowManager.getInstance().getIndexForWindow(
-                                    tabbedActivity));
                         }
 
-                        return selectorIndexes;
+                        return null;
                     }
                 });
     }
 
     /**
      * @return Whether deleting all the incognito files was successful.
      */
     private boolean deleteIncognitoStateFilesInDirectory(File directory) {
         File[] allTabStates = directory.listFiles();
         if (allTabStates == null) return true;
 
         boolean deletionSuccessful = true;
         for (int i = 0; i < allTabStates.length; i++) {
             String fileName = allTabStates[i].getName();
             Pair<Integer, Boolean> tabInfo = TabState.parseInfoFromFilename(fileName);
             if (tabInfo == null || !tabInfo.second) continue;
             deletionSuccessful &= allTabStates[i].delete();
         }
         return deletionSuccessful;
     }
 
 }