Adding content capture observer and abstract clearing methods

* Adding abstract methods to ContentCaptureController for data clearing.
* Adding observer for content capture.
* Hooking up the observer to the HistoryDeletionBridge.

Bug: 954404
Change-Id: I80ef890d619914d3b4f9f7fe50fc192ac5f9a10d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1623529
Commit-Queue: Brandon Wylie <wylieb@chromium.org>
Reviewed-by: Tao Bai <michaelbai@chromium.org>
Reviewed-by: Ted Choc <tedchoc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#663966}

chrome/android/chrome_java_sources.gni

@@ -292,6 +292,7 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/contacts_picker/PickerCategoryView.java",
   "java/src/org/chromium/chrome/browser/contacts_picker/TopView.java",
   "java/src/org/chromium/chrome/browser/content/ContentUtils.java",
+  "java/src/org/chromium/chrome/browser/content_capture/ContentCaptureHistoryDeletionObserver.java",
   "java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuItem.java",
   "java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java",
   "java/src/org/chromium/chrome/browser/contextmenu/ContextMenuHelper.java",

chrome/android/java/src/org/chromium/chrome/browser/content_capture/ContentCaptureHistoryDeletionObserver.java

+// Copyright 2019 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.content_capture;
+
+import org.chromium.chrome.browser.history.HistoryDeletionBridge;
+import org.chromium.chrome.browser.history.HistoryDeletionInfo;
+import org.chromium.components.content_capture.ContentCaptureController;
+
+/** History deletion observer that calls ContentCapture methods. */
+public class ContentCaptureHistoryDeletionObserver implements HistoryDeletionBridge.Observer {
+    /** Observer method when a bit of history is deleted. */
+    @Override
+    public void onURLsDeleted(HistoryDeletionInfo historyDeletionInfo) {
+        ContentCaptureController contentCaptureController = ContentCaptureController.getInstance();
+        if (contentCaptureController == null) return;
+
+        if (historyDeletionInfo.isTimeRangeForAllTime()
+                || (historyDeletionInfo.isTimeRangeValid()
+                        && historyDeletionInfo.getTimeRangeBegin()
+                                != historyDeletionInfo.getTimeRangeEnd())) {
+            contentCaptureController.clearAllContentCaptureData();
+        } else {
+            contentCaptureController.clearContentCaptureDataForURLs(
+                    historyDeletionInfo.getDeletedURLs());
+        }
+    }
+}

chrome/android/java/src/org/chromium/chrome/browser/content_capture/OWNERS

+tedchoc@chromium.org
+wylieb@chomium.org
+
+file://components/content_capture/OWNERS

chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java

@@ -44,11 +44,13 @@ import org.chromium.chrome.browser.DevToolsServer;
 import org.chromium.chrome.browser.banners.AppBannerManager;
 import org.chromium.chrome.browser.bookmarkswidget.BookmarkWidgetProvider;
 import org.chromium.chrome.browser.contacts_picker.ContactsPickerDialog;
+import org.chromium.chrome.browser.content_capture.ContentCaptureHistoryDeletionObserver;
 import org.chromium.chrome.browser.crash.LogcatExtractionRunnable;
 import org.chromium.chrome.browser.crash.MinidumpUploadService;
 import org.chromium.chrome.browser.download.DownloadController;
 import org.chromium.chrome.browser.download.DownloadManagerService;
 import org.chromium.chrome.browser.firstrun.ForcedSigninProcessor;
+import org.chromium.chrome.browser.history.HistoryDeletionBridge;
 import org.chromium.chrome.browser.identity.UniqueIdentificationGeneratorFactory;
 import org.chromium.chrome.browser.identity.UuidBasedUniqueIdentificationGenerator;
 import org.chromium.chrome.browser.incognito.IncognitoTabLauncher;
@@ -265,6 +267,8 @@ public class ProcessInitializationHandler {
         });
 
         SearchWidgetProvider.initialize();
+        HistoryDeletionBridge.getInstance().addObserver(
+                new ContentCaptureHistoryDeletionObserver());
     }
 
     /**

components/content_capture/android/java/src/org/chromium/components/content_capture/ContentCaptureController.java

@@ -33,6 +33,16 @@ public abstract class ContentCaptureController {
      */
     public abstract boolean shouldStartCapture();
 
+    /**
+     * Clear all ContentCapture data associated with Chrome.
+     */
+    public void clearAllContentCaptureData() {}
+
+    /**
+     * Clear ContentCapture data for specific URLs.
+     */
+    public void clearContentCaptureDataForURLs(String[] urlsToDelete) {}
+
     /**
      * Invoked by native side to pull the whitelist, the subclass should implement this and set
      * the whitelist by call setWhiteList.