Add helper method to sanitize DeletionInfo of invalid/empty urls

Bug: 1136486
Change-Id: Id15a99875e7529985df3d795994dbb162e5c0460
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2462491
Commit-Queue: Brandon Wylie <wylieb@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Reviewed-by: Filip Gorski <fgorski@chromium.org>
Cr-Commit-Position: refs/heads/master@{#818041}

chrome/browser/android/history/history_deletion_bridge.cc

@@ -24,6 +24,17 @@ static jlong JNI_HistoryDeletionBridge_Init(JNIEnv* env,
   return reinterpret_cast<intptr_t>(new HistoryDeletionBridge(jobj));
 }
 
+// static
+history::DeletionInfo HistoryDeletionBridge::SanitizeDeletionInfo(
+    const history::DeletionInfo& deletion_info) {
+  std::vector<history::URLRow> sanitized_rows;
+  for (auto row : deletion_info.deleted_rows()) {
+    if (!row.url().is_empty() && row.url().is_valid())
+      sanitized_rows.push_back(row);
+  }
+  return history::DeletionInfo::ForUrls(sanitized_rows, {});
+}
+
 HistoryDeletionBridge::HistoryDeletionBridge(const JavaRef<jobject>& jobj)
     : jobj_(ScopedJavaGlobalRef<jobject>(jobj)),
       profile_(ProfileManager::GetLastUsedProfile()->GetOriginalProfile()) {
@@ -47,6 +58,7 @@ void HistoryDeletionBridge::OnURLsDeleted(
     const history::DeletionInfo& deletion_info) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   JNIEnv* env = base::android::AttachCurrentThread();
+  history::DeletionInfo sanitized_info = SanitizeDeletionInfo(deletion_info);
   Java_HistoryDeletionBridge_onURLsDeleted(
-      env, jobj_, CreateHistoryDeletionInfo(env, &deletion_info));
+      env, jobj_, CreateHistoryDeletionInfo(env, &sanitized_info));
 }

chrome/browser/android/history/history_deletion_bridge.h

@@ -25,6 +25,12 @@ class HistoryDeletionBridge : public history::HistoryServiceObserver {
   void OnURLsDeleted(history::HistoryService* history_service,
                      const history::DeletionInfo& deletion_info) override;
 
+  // Sanitize the DeletionInfo of empty/invalid urls before passing to java.
+  // Fix for empty java strings being passed to the content capture service
+  // (crbug.com/1136486).
+  static history::DeletionInfo SanitizeDeletionInfo(
+      const history::DeletionInfo& deletion_info);
+
  private:
   ~HistoryDeletionBridge() override;
 

chrome/browser/android/history/history_deletion_bridge_unittest.cc

+// Copyright 2020 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.
+
+#include "chrome/browser/android/history/history_deletion_bridge.h"
+
+#include "base/time/time.h"
+#include "components/history/core/browser/history_types.h"
+#include "components/history/core/browser/url_row.h"
+#include "testing/gtest/include/gtest/gtest.h"
+#include "url/gurl.h"
+
+TEST(HistoryDeletionBridge, TestSanitizeDeletionInfo) {
+  history::DeletionInfo info = history::DeletionInfo::ForUrls(
+      {history::URLResult(GURL("https://google.com/"), base::Time()),
+       history::URLResult(GURL("https://google.com/foo"), base::Time()),
+       history::URLResult(GURL("htt\\invalido\\gle.com"), base::Time()),
+       history::URLResult(GURL(""), base::Time())},
+      {});
+
+  std::vector<GURL> expected = {GURL("https://google.com/"),
+                                GURL("https://google.com/foo")};
+  std::vector<history::URLRow> actual =
+      HistoryDeletionBridge::SanitizeDeletionInfo(info).deleted_rows();
+  EXPECT_EQ(expected.size(), actual.size());
+
+  for (auto row : actual)
+    EXPECT_NE(expected.end(),
+              std::find(expected.begin(), expected.end(), row.url()));
+}

chrome/test/BUILD.gn

@@ -3790,6 +3790,7 @@ test("unit_tests") {
       "../browser/android/explore_sites/ntp_json_fetcher_unittest.cc",
       "../browser/android/explore_sites/record_site_click_task_unittest.cc",
       "../browser/android/favicon_helper_unittest.cc",
+      "../browser/android/history/history_deletion_bridge_unittest.cc",
       "../browser/android/history_report/data_observer_unittest.cc",
       "../browser/android/history_report/delta_file_backend_leveldb_unittest.cc",
       "../browser/android/history_report/delta_file_commons_unittest.cc",