Remove FeedbackSourceProvider

Additional downstream FeedbackSourceProviders were removed in
https://crrev.com/i/3119108, so this now removes redundant classes and
methods.

Bug: 1098518
Change-Id: I4c3cedadc9538126c45a4255f20427c1452f088e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2261615
Commit-Queue: Natalie Chouinard <chouinard@chromium.org>
Reviewed-by: David Trainor <dtrainor@chromium.org>
Cr-Commit-Position: refs/heads/master@{#782679}

chrome/android/chrome_java_sources.gni

@@ -694,7 +694,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/feedback/FeedbackContextFeedbackSource.java",
   "java/src/org/chromium/chrome/browser/feedback/FeedbackReporter.java",
   "java/src/org/chromium/chrome/browser/feedback/FeedbackSource.java",
-  "java/src/org/chromium/chrome/browser/feedback/FeedbackSourceProvider.java",
   "java/src/org/chromium/chrome/browser/feedback/HistogramFeedbackSource.java",
   "java/src/org/chromium/chrome/browser/feedback/IMEFeedbackSource.java",
   "java/src/org/chromium/chrome/browser/feedback/InterestFeedFeedbackSource.java",

chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java

@@ -20,11 +20,7 @@ import org.chromium.chrome.browser.banners.AppDetailsDelegate;
 import org.chromium.chrome.browser.customtabs.CustomTabsConnection;
 import org.chromium.chrome.browser.directactions.DirectActionCoordinator;
 import org.chromium.chrome.browser.externalauth.ExternalAuthUtils;
-import org.chromium.chrome.browser.feedback.AsyncFeedbackSource;
-import org.chromium.chrome.browser.feedback.FeedbackCollector;
 import org.chromium.chrome.browser.feedback.FeedbackReporter;
-import org.chromium.chrome.browser.feedback.FeedbackSource;
-import org.chromium.chrome.browser.feedback.FeedbackSourceProvider;
 import org.chromium.chrome.browser.gsa.GSAHelper;
 import org.chromium.chrome.browser.help.HelpAndFeedback;
 import org.chromium.chrome.browser.historyreport.AppIndexingReporter;
@@ -281,14 +277,6 @@ public abstract class AppHooks {
         return new PartnerBrowserCustomizations.ProviderPackage();
     }
 
-    /**
-     * @return A {@link FeedbackSourceProvider} that can provide additional {@link FeedbackSource}s
-     * and {@link AsyncFeedbackSource}s to be used by a {@link FeedbackCollector}.
-     */
-    public FeedbackSourceProvider getAdditionalFeedbackSources() {
-        return new FeedbackSourceProvider() {};
-    }
-
     /**
      * @return A new {@link FeatureHighlightProvider}.
      */

chrome/android/java/src/org/chromium/chrome/browser/feedback/FeedbackCollector.java

@@ -17,7 +17,6 @@ import org.chromium.base.Callback;
 import org.chromium.base.CollectionUtil;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.task.PostTask;
-import org.chromium.chrome.browser.AppHooks;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.content_public.browser.UiThreadTaskTraits;
 
@@ -81,7 +80,6 @@ public class FeedbackCollector implements Runnable {
 
         // This is the list of all synchronous sources of feedback.  Please add new synchronous
         // entries here.
-        sources.addAll(AppHooks.get().getAdditionalFeedbackSources().getSynchronousSources());
         sources.add(new UrlFeedbackSource(url));
         sources.add(new VariationsFeedbackSource(profile));
         sources.add(new DataReductionProxyFeedbackSource(profile));
@@ -107,7 +105,6 @@ public class FeedbackCollector implements Runnable {
 
         // This is the list of all asynchronous sources of feedback.  Please add new asynchronous
         // entries here.
-        sources.addAll(AppHooks.get().getAdditionalFeedbackSources().getAsynchronousSources());
         sources.add(new ConnectivityFeedbackSource(profile));
         sources.add(new SystemInfoFeedbackSource());
         sources.add(new ProcessIdFeedbackSource());

chrome/android/java/src/org/chromium/chrome/browser/feedback/FeedbackSourceProvider.java

-// Copyright 2017 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.feedback;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-/**
- * Used for an external component to be able to provide extra feedback sources to the
- * FeedbackCollector.  In general it is best to add the sources directly to FeedbackCollector, but
- * if there are DEPS or repository reasons for not doing that, they can be provided through here.
- */
-public interface FeedbackSourceProvider {
-    // clang-format off
-    // TODO(crbug.com/781015): Clang isn't formatting this correctly.
-    /** @return A list of {@link FeedbackSource}s to add to a {@link FeedbackCollector}. */
-    default Collection<FeedbackSource> getSynchronousSources() { return new ArrayList<>(); }
-
-    /** @return A list of {@link AsyncFeedbackSource}s to add to a {@link FeedbackCollector}. */
-    default Collection<AsyncFeedbackSource> getAsynchronousSources() { return new ArrayList<>(); }
-        // clang-format on
-}