Revert^2 "[gbb-cct] Migrating only functions with no C++ dependencies from FeedProcessScopeDependencyProvider to ProcessScopeDependencyProvider."
This reverts commit cf837412701a94fa95bb9a769aafe47e780446b3.
Reason for revert: Reland now that test breakage has been avoided with https://chrome-internal-review.googlesource.com/c/clank/internal/apps/+/6858334
Original change's description:
> Revert "[gbb-cct] Migrating only functions with no C++ dependencies from FeedProcessScopeDependencyProvider to ProcessScopeDependencyProvider."
>
> This reverts commit 4f962a3c84f6427400afdda408afe5758dd6ce16.
>
> Reason for revert: Causing build failures on arm-unpublished-builder-rel. See https://crbug.com/1517285
>
> Original change's description:
> > [gbb-cct] Migrating only functions with no C++ dependencies from FeedProcessScopeDependencyProvider to ProcessScopeDependencyProvider.
> >
> > This is done so that non-Feed XSurface clients are not depending on Feed library (as part of Code Refactoring of Chrome Implementation of Page Insights Hub). This CL is only migrating the members not depending on the C++ classes and thus the ProcessScopeDependencyProvider is inherited from the class for now to not break other code.
> >
> > For further reference go to: go/chrome-pih-feed-dependency-removal
> >
> > Change-Id: Ibfe744572aba75e5eebf018c207cd91448e85c8a
> > Bug: b/297999162
> > Low-Coverage-Reason: The tests have been just migrated and no new functions have been added and thus there is no change in test coverage.
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5119740
> > Reviewed-by: Dan H <[email protected]>
> > Commit-Queue: Kamal Choudhury <[email protected]>
> > Reviewed-by: Edmund Wright <[email protected]>
> > Cr-Commit-Position: refs/heads/main@{#1245200}
>
> Bug: 1517285
> Bug: b/297999162
> Change-Id: I925b5f0b6b661d03fdaf6171f24b386460914b59
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5182657
> Owners-Override: Ashley Newson <[email protected]>
> Bot-Commit: Rubber Stamper <[email protected]>
> Commit-Queue: Ashley Newson <[email protected]>
> Cr-Commit-Position: refs/heads/main@{#1245237}
Bug: 1517285
Bug: b/297999162
Change-Id: I0b53a69489f7df4d977debc636c42752c105a617
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5189628
Commit-Queue: Kamal Choudhury <[email protected]>
Reviewed-by: Edmund Wright <[email protected]>
Reviewed-by: Dan H <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1246448}
diff --git a/chrome/browser/xsurface_provider/BUILD.gn b/chrome/browser/xsurface_provider/BUILD.gn
index 7e999e77..f83eec6 100644
--- a/chrome/browser/xsurface_provider/BUILD.gn
+++ b/chrome/browser/xsurface_provider/BUILD.gn
@@ -24,7 +24,10 @@
android_library("dependency_provider_impl_java") {
sources = [ "android/java/src/org/chromium/chrome/browser/xsurface_provider/ProcessScopeDependencyProviderImpl.java" ]
deps = [
+ "//base:base_java",
+ "//base/version_info/android:version_constants_java",
"//chrome/browser/feed/android:java",
+ "//chrome/browser/flags:java",
"//chrome/browser/privacy:java",
"//chrome/browser/xsurface:java",
"//third_party/androidx:androidx_annotation_annotation_java",
@@ -37,13 +40,20 @@
}
robolectric_library("junit") {
- sources = [ "android/java/src/org/chromium/chrome/browser/xsurface_provider/XSurfaceProcessScopeProviderTest.java" ]
+ sources = [
+ "android/java/src/org/chromium/chrome/browser/xsurface_provider/ProcessScopeDependencyProviderImplTest.java",
+ "android/java/src/org/chromium/chrome/browser/xsurface_provider/XSurfaceProcessScopeProviderTest.java",
+ ]
deps = [
+ ":dependency_provider_impl_java",
":java",
"//base:base_java",
"//base:base_java_test_support",
"//base:base_junit_test_support",
+ "//chrome/browser/flags:java",
+ "//chrome/browser/privacy:java",
"//chrome/browser/xsurface:java",
+ "//chrome/test/android:chrome_java_unit_test_support",
"//third_party/androidx:androidx_test_runner_java",
"//third_party/junit",
"//third_party/mockito:mockito_java",
