Commit 7bc481a4 authored by Mikel Astiz's avatar Mikel Astiz Committed by Commit Bot

Expose FCMInvalidations to Java

We've observed some tests CHECK-failing with:
[FATAL:chrome_feature_list.cc(185)] Check failed: false. Queried feature cannot be found in ChromeFeatureList: FCMInvalidations

Since we have plans to expose this feature to Java anyway, let's keep
existing tests happy by exposing the feature to Java.

Bug: 879246
Change-Id: Ie148a8d31a5d93a700a569090f7c4a6b3d27194b
Reviewed-on: https://chromium-review.googlesource.com/c/1296592Reviewed-by: default avatarTatiana Gornak <melandory@chromium.org>
Reviewed-by: default avatarPavel Yatsuk <pavely@chromium.org>
Commit-Queue: Mikel Astiz <mastiz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#602003}
parent 1dd03499
...@@ -2540,6 +2540,7 @@ jumbo_split_static_library("browser") { ...@@ -2540,6 +2540,7 @@ jumbo_split_static_library("browser") {
"//components/embedder_support/android:web_contents_delegate", "//components/embedder_support/android:web_contents_delegate",
"//components/feed:buildflags", "//components/feed:buildflags",
"//components/feed:feature_list", "//components/feed:feature_list",
"//components/invalidation/impl:feature_list",
"//components/language/android:language_bridge", "//components/language/android:language_bridge",
"//components/payments/content/android", "//components/payments/content/android",
"//components/resources:components_resources", "//components/resources:components_resources",
......
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
#include "components/autofill/core/common/autofill_features.h" #include "components/autofill/core/common/autofill_features.h"
#include "components/data_reduction_proxy/core/common/data_reduction_proxy_features.h" #include "components/data_reduction_proxy/core/common/data_reduction_proxy_features.h"
#include "components/feed/feed_feature_list.h" #include "components/feed/feed_feature_list.h"
#include "components/invalidation/impl/invalidation_switches.h"
#include "components/language/core/common/language_experiments.h" #include "components/language/core/common/language_experiments.h"
#include "components/ntp_snippets/contextual/contextual_suggestions_features.h" #include "components/ntp_snippets/contextual/contextual_suggestions_features.h"
#include "components/ntp_snippets/features.h" #include "components/ntp_snippets/features.h"
...@@ -73,6 +74,7 @@ const base::Feature* kFeaturesExposedToJava[] = { ...@@ -73,6 +74,7 @@ const base::Feature* kFeaturesExposedToJava[] = {
&features::kWebAuth, &features::kWebAuth,
&features::kWebPayments, &features::kWebPayments,
&feed::kInterestFeedContentSuggestions, &feed::kInterestFeedContentSuggestions,
&invalidation::switches::kFCMInvalidations,
&kAdjustWebApkInstallationSpace, &kAdjustWebApkInstallationSpace,
&kAndroidPayIntegrationV1, &kAndroidPayIntegrationV1,
&kAndroidPayIntegrationV2, &kAndroidPayIntegrationV2,
......
...@@ -6,6 +6,17 @@ if (is_android) { ...@@ -6,6 +6,17 @@ if (is_android) {
import("//build/config/android/rules.gni") import("//build/config/android/rules.gni")
} }
static_library("feature_list") {
sources = [
"invalidation_switches.cc",
"invalidation_switches.h",
]
deps = [
"//base",
]
}
static_library("impl") { static_library("impl") {
sources = [ sources = [
"deprecated_invalidator_registrar.cc", "deprecated_invalidator_registrar.cc",
...@@ -19,8 +30,6 @@ static_library("impl") { ...@@ -19,8 +30,6 @@ static_library("impl") {
"invalidation_service_util.h", "invalidation_service_util.h",
"invalidation_state_tracker.cc", "invalidation_state_tracker.cc",
"invalidation_state_tracker.h", "invalidation_state_tracker.h",
"invalidation_switches.cc",
"invalidation_switches.h",
"invalidator.cc", "invalidator.cc",
"invalidator.h", "invalidator.h",
"invalidator_registrar.cc", "invalidator_registrar.cc",
...@@ -46,6 +55,7 @@ static_library("impl") { ...@@ -46,6 +55,7 @@ static_library("impl") {
] ]
public_deps = [ public_deps = [
":feature_list",
"//components/invalidation/public", "//components/invalidation/public",
] ]
deps = [ deps = [
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment