Remove SurfaceDependencyProvider.

No functionality changes, this is just a multi-sided rename.
CL chain:
- https://chromium-review.googlesource.com/c/chromium/src/+/2261633
- https://chromium-review.googlesource.com/c/chromium/src/+/2285471
- cl/320246139
- https://chrome-internal-review.googlesource.com/c/clank/internal/apps/+/3167007
- [this CL]


Change-Id: I0430d16ad79ea1d43bcdc63dbc5795ef7c1f3d64
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2284097Reviewed-by: Yusuf Ozuysal <yusufo@chromium.org>
Reviewed-by: Cathy Li <chili@chromium.org>
Commit-Queue: Justin DeWitt <dewittj@chromium.org>
Cr-Commit-Position: refs/heads/master@{#797518}

chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/v2/FeedStreamSurface.java

@@ -42,8 +42,8 @@ import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
 import org.chromium.chrome.browser.xsurface.FeedActionsHandler;
 import org.chromium.chrome.browser.xsurface.HybridListRenderer;
 import org.chromium.chrome.browser.xsurface.ProcessScope;
+import org.chromium.chrome.browser.xsurface.ProcessScopeDependencyProvider;
 import org.chromium.chrome.browser.xsurface.SurfaceActionsHandler;
-import org.chromium.chrome.browser.xsurface.SurfaceDependencyProvider;
 import org.chromium.chrome.browser.xsurface.SurfaceScope;
 import org.chromium.chrome.browser.xsurface.SurfaceScopeDependencyProvider;
 import org.chromium.components.browser_ui.bottomsheet.BottomSheetContent;
@@ -116,7 +116,7 @@ public class FeedStreamSurface implements SurfaceActionsHandler, FeedActionsHand
     public static ProcessScope xSurfaceProcessScope() {
         if (sXSurfaceProcessScope == null) {
             sXSurfaceProcessScope = AppHooks.get().getExternalSurfaceProcessScope(
-                    new FeedSurfaceDependencyProvider());
+                    new FeedProcessScopeDependencyProvider());
         }
         return sXSurfaceProcessScope;
     }
@@ -201,8 +201,9 @@ public class FeedStreamSurface implements SurfaceActionsHandler, FeedActionsHand
      *
      * TODO(rogerm): Find a more global home for this.
      */
-    private static class FeedSurfaceDependencyProvider implements SurfaceDependencyProvider {
-        FeedSurfaceDependencyProvider() {}
+    private static class FeedProcessScopeDependencyProvider
+            implements ProcessScopeDependencyProvider {
+        FeedProcessScopeDependencyProvider() {}
 
         @Override
         public Context getContext() {

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

@@ -42,7 +42,6 @@ import org.chromium.chrome.browser.usage_stats.DigitalWellbeingClient;
 import org.chromium.chrome.browser.webapps.GooglePlayWebApkInstallDelegate;
 import org.chromium.chrome.browser.xsurface.ProcessScope;
 import org.chromium.chrome.browser.xsurface.ProcessScopeDependencyProvider;
-import org.chromium.chrome.browser.xsurface.SurfaceDependencyProvider;
 import org.chromium.components.browser_ui.widget.FeatureHighlightProvider;
 import org.chromium.components.external_intents.AuthenticatorNavigationInterceptor;
 import org.chromium.components.signin.AccountManagerDelegate;
@@ -349,19 +348,6 @@ public abstract class AppHooks {
         return null;
     }
 
-    /**
-     * Returns a new {@link SurfaceRenderer} if the xsurface implementation is included in the
-     * apk. Otherwise null is returned.
-     *
-     * This API is deprecated, and will be removed after safely renaming SurfaceDependencyProvider
-     * to ProcessScopeDependencyProvider.
-     */
-    @Deprecated
-    public @Nullable ProcessScope getExternalSurfaceProcessScope(
-            SurfaceDependencyProvider dependencies) {
-        return getExternalSurfaceProcessScope((ProcessScopeDependencyProvider) dependencies);
-    }
-
     /**
      * Returns the URL to the WebAPK creation/update server.
      */

chrome/browser/xsurface/BUILD.gn

@@ -13,7 +13,6 @@ android_library("java") {
     "android/java/src/org/chromium/chrome/browser/xsurface/ProcessScope.java",
     "android/java/src/org/chromium/chrome/browser/xsurface/ProcessScopeDependencyProvider.java",
     "android/java/src/org/chromium/chrome/browser/xsurface/SurfaceActionsHandler.java",
-    "android/java/src/org/chromium/chrome/browser/xsurface/SurfaceDependencyProvider.java",
     "android/java/src/org/chromium/chrome/browser/xsurface/SurfaceRenderer.java",
     "android/java/src/org/chromium/chrome/browser/xsurface/SurfaceScope.java",
     "android/java/src/org/chromium/chrome/browser/xsurface/SurfaceScopeDependencyProvider.java",

chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/ProcessScopeDependencyProvider.java

@@ -10,8 +10,6 @@ import androidx.annotation.Nullable;
 
 /**
  * Provides application-level dependencies for an external surface.
- *
- * Note: this will replace SurfaceDependencyProvider and so does not have any methods.
  */
 public interface ProcessScopeDependencyProvider {
     /** @return the context associated with the application. */

chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/SurfaceDependencyProvider.java

-// 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.
-
-package org.chromium.chrome.browser.xsurface;
-
-/**
- * Provides logging and context for an external surface.
- *
- * Note: this will replace SurfaceDependencyProvider and so does not have any methods.
- */
-@Deprecated
-public interface SurfaceDependencyProvider extends ProcessScopeDependencyProvider {}