Rename DocumentUtils to AndroidTaskUtils, move to chrome/browser/util

Bug: 995916
Change-Id: Ic874d6287e224da3277cff98457604617f5a64dd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1814919
Commit-Queue: Henrique Nakashima <hnakashima@chromium.org>
Reviewed-by: David Trainor <dtrainor@chromium.org>
Cr-Commit-Position: refs/heads/master@{#700390}

chrome/android/chrome_java_sources.gni

@@ -475,7 +475,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/directactions/SimpleDirectActionHandler.java",
   "java/src/org/chromium/chrome/browser/display_cutout/DisplayCutoutController.java",
   "java/src/org/chromium/chrome/browser/document/ChromeLauncherActivity.java",
-  "java/src/org/chromium/chrome/browser/document/DocumentUtils.java",
   "java/src/org/chromium/chrome/browser/document/DocumentWebContentsDelegate.java",
   "java/src/org/chromium/chrome/browser/dom_distiller/DistilledPagePrefsView.java",
   "java/src/org/chromium/chrome/browser/dom_distiller/DomDistillerServiceFactory.java",

chrome/android/java/DEPS

@@ -3,6 +3,7 @@ include_rules = [
 
   "+chrome/browser/android/thin_webview/java",
   "+chrome/browser/ui/android/widget",
+  "+chrome/browser/util/android/java",
   "+chrome/lib/lifecycle/public",
   "+chrome/lib/image_fetcher/public",
   "+components/embedder_support/android",

chrome/android/java/src/org/chromium/chrome/browser/incognito/IncognitoNotificationService.java

@@ -24,9 +24,9 @@ import org.chromium.base.library_loader.LibraryProcessType;
 import org.chromium.base.task.PostTask;
 import org.chromium.chrome.browser.ChromeTabbedActivity;
 import org.chromium.chrome.browser.document.ChromeLauncherActivity;
-import org.chromium.chrome.browser.document.DocumentUtils;
 import org.chromium.chrome.browser.notifications.PendingIntentProvider;
 import org.chromium.chrome.browser.profiles.Profile;
+import org.chromium.chrome.browser.util.AndroidTaskUtils;
 import org.chromium.content_public.browser.BrowserStartupController;
 import org.chromium.content_public.browser.UiThreadTaskTraits;
 
@@ -123,9 +123,9 @@ public class IncognitoNotificationService extends IntentService {
                 (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
 
         for (AppTask task : manager.getAppTasks()) {
-            RecentTaskInfo info = DocumentUtils.getTaskInfoFromTask(task);
+            RecentTaskInfo info = AndroidTaskUtils.getTaskInfoFromTask(task);
             if (info == null) continue;
-            String componentName = DocumentUtils.getTaskComponentName(task);
+            String componentName = AndroidTaskUtils.getTaskComponentName(task);
 
             // It is not easily possible to distinguish between tasks sitting on top of
             // ChromeLauncherActivity, so we treat them all as likely ChromeTabbedActivities and

chrome/android/java/src/org/chromium/chrome/browser/incognito/IncognitoUtils.java

@@ -14,10 +14,10 @@ import android.util.Pair;
 import org.chromium.base.ApplicationStatus;
 import org.chromium.base.ContextUtils;
 import org.chromium.chrome.browser.ChromeTabbedActivity;
-import org.chromium.chrome.browser.document.DocumentUtils;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.tab.TabState;
 import org.chromium.chrome.browser.tabmodel.TabbedModeTabPersistencePolicy;
+import org.chromium.chrome.browser.util.AndroidTaskUtils;
 
 import java.io.File;
 import java.util.HashSet;
@@ -49,9 +49,9 @@ public class IncognitoUtils {
 
         Set<Integer> tabbedModeTaskIds = new HashSet<>();
         for (ActivityManager.AppTask task : manager.getAppTasks()) {
-            ActivityManager.RecentTaskInfo info = DocumentUtils.getTaskInfoFromTask(task);
+            ActivityManager.RecentTaskInfo info = AndroidTaskUtils.getTaskInfoFromTask(task);
             if (info == null) continue;
-            String componentName = DocumentUtils.getTaskComponentName(task);
+            String componentName = AndroidTaskUtils.getTaskComponentName(task);
 
             if (ChromeTabbedActivity.isTabbedModeComponentName(componentName)) {
                 tabbedModeTaskIds.add(info.id);

chrome/android/java/src/org/chromium/chrome/browser/multiwindow/MultiInstanceManager.java

@@ -21,13 +21,13 @@ import org.chromium.base.VisibleForTesting;
 import org.chromium.base.metrics.RecordUserAction;
 import org.chromium.chrome.browser.ChromeTabbedActivity;
 import org.chromium.chrome.browser.MenuOrKeyboardActionController;
-import org.chromium.chrome.browser.document.DocumentUtils;
 import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher;
 import org.chromium.chrome.browser.lifecycle.Destroyable;
 import org.chromium.chrome.browser.lifecycle.NativeInitObserver;
 import org.chromium.chrome.browser.lifecycle.PauseResumeWithNativeObserver;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tabmodel.TabModelSelector;
+import org.chromium.chrome.browser.util.AndroidTaskUtils;
 import org.chromium.chrome.browser.util.FeatureUtilities;
 
 import java.util.List;
@@ -302,7 +302,7 @@ public class MultiInstanceManager
         ActivityManager manager =
                 (ActivityManager) mContext.getSystemService(Context.ACTIVITY_SERVICE);
         for (ActivityManager.AppTask task : manager.getAppTasks()) {
-            ActivityManager.RecentTaskInfo info = DocumentUtils.getTaskInfoFromTask(task);
+            ActivityManager.RecentTaskInfo info = AndroidTaskUtils.getTaskInfoFromTask(task);
             if (info == null) continue;
             if (info.id == sMergedInstanceTaskId) return true;
         }

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

@@ -40,7 +40,6 @@ import org.chromium.chrome.browser.browserservices.BrowserServicesIntentDataProv
 import org.chromium.chrome.browser.compositor.layouts.LayoutManager;
 import org.chromium.chrome.browser.customtabs.CustomTabAppMenuPropertiesDelegate;
 import org.chromium.chrome.browser.document.ChromeLauncherActivity;
-import org.chromium.chrome.browser.document.DocumentUtils;
 import org.chromium.chrome.browser.metrics.WebApkUma;
 import org.chromium.chrome.browser.tab.EmptyTabObserver;
 import org.chromium.chrome.browser.tab.Tab;
@@ -52,6 +51,7 @@ import org.chromium.chrome.browser.tab.TabState;
 import org.chromium.chrome.browser.toolbar.top.ToolbarControlContainer;
 import org.chromium.chrome.browser.ui.widget.TintedDrawable;
 import org.chromium.chrome.browser.usage_stats.UsageStatsService;
+import org.chromium.chrome.browser.util.AndroidTaskUtils;
 import org.chromium.chrome.browser.util.ColorUtils;
 import org.chromium.content_public.browser.LoadUrlParams;
 import org.chromium.content_public.browser.NavigationController;
@@ -453,7 +453,7 @@ public class WebappActivity extends SingleTabActivity {
         if (!isFinishing()) {
             if (getIntent() != null) {
                 // Avoid situations where Android starts two Activities with the same data.
-                DocumentUtils.finishOtherTasksWithData(getIntent().getData(), getTaskId());
+                AndroidTaskUtils.finishOtherTasksWithData(getIntent().getData(), getTaskId());
             }
             updateTaskDescription();
         }

chrome/browser/util/android/BUILD.gn

@@ -6,6 +6,7 @@ import("//build/config/android/rules.gni")
 
 android_library("java") {
   java_files = [
+    "java/src/org/chromium/chrome/browser/util/AndroidTaskUtils.java",
     "java/src/org/chromium/chrome/browser/util/BitmapCache.java",
     "java/src/org/chromium/chrome/browser/util/ChromeContextUtil.java",
     "java/src/org/chromium/chrome/browser/util/ChromeFileProvider.java",

chrome/android/java/src/org/chromium/chrome/browser/document/DocumentUtils.java → chrome/browser/util/android/java/src/org/chromium/chrome/browser/util/AndroidTaskUtils.java

@@ -2,7 +2,7 @@
 // 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.document;
+package org.chromium.chrome.browser.util;
 
 import android.annotation.TargetApi;
 import android.app.ActivityManager;
@@ -26,7 +26,7 @@ import java.util.List;
  * Deals with Document-related API calls.
  */
 @TargetApi(Build.VERSION_CODES.LOLLIPOP)
-public class DocumentUtils {
+public class AndroidTaskUtils {
     public static final String TAG = "DocumentUtilities";
 
     /**