Commit 48fc6f8c authored by Sky Malice's avatar Sky Malice Committed by Commit Bot

[Feed] Temporarily compile out Feed for branching.

Feed component adds a significant amount of code that's not used yet
for users. See Feed DEPS rolls for current size impact.

This change also fixes some areas outside of components/feed/ that were
assuming Feed was always compiled in on Android.

TBR=gab@chromium.org

Change-Id: I72944b4518388ee650f9fd0c444d52b9ddcc23b7
Reviewed-on: https://chromium-review.googlesource.com/1142296
Commit-Queue: Sky Malice <skym@chromium.org>
Reviewed-by: default avatarFilip Gorski <fgorski@chromium.org>
Reviewed-by: default avatarMartin Šrámek <msramek@chromium.org>
Cr-Commit-Position: refs/heads/master@{#576351}
parent a76c901a
...@@ -108,6 +108,7 @@ ...@@ -108,6 +108,7 @@
#include "chrome/browser/android/webapps/webapp_registry.h" #include "chrome/browser/android/webapps/webapp_registry.h"
#include "chrome/browser/media/android/cdm/media_drm_license_manager.h" #include "chrome/browser/media/android/cdm/media_drm_license_manager.h"
#include "chrome/browser/offline_pages/offline_page_model_factory.h" #include "chrome/browser/offline_pages/offline_page_model_factory.h"
#include "components/feed/buildflags.h"
#include "components/offline_pages/core/offline_page_feature.h" #include "components/offline_pages/core/offline_page_feature.h"
#include "components/offline_pages/core/offline_page_model.h" #include "components/offline_pages/core/offline_page_model.h"
#include "sql/connection.h" #include "sql/connection.h"
...@@ -412,11 +413,13 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData( ...@@ -412,11 +413,13 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
} }
#if defined(OS_ANDROID) #if defined(OS_ANDROID)
#if BUILDFLAG(ENABLE_FEED_IN_CHROME)
feed::FeedHostService* feed_host_service = feed::FeedHostService* feed_host_service =
feed::FeedHostServiceFactory::GetForBrowserContext(profile_); feed::FeedHostServiceFactory::GetForBrowserContext(profile_);
if (feed_host_service) { if (feed_host_service) {
feed_host_service->GetSchedulerHost()->OnHistoryCleared(); feed_host_service->GetSchedulerHost()->OnHistoryCleared();
} }
#endif // BUILDFLAG(ENABLE_FEED_IN_CHROME)
#endif // defined(OS_ANDROID) #endif // defined(OS_ANDROID)
language::UrlLanguageHistogram* language_histogram = language::UrlLanguageHistogram* language_histogram =
......
...@@ -96,6 +96,7 @@ ...@@ -96,6 +96,7 @@
#include "chrome/browser/android/customtabs/origin_verifier.h" #include "chrome/browser/android/customtabs/origin_verifier.h"
#include "chrome/browser/android/search_permissions/search_permissions_service.h" #include "chrome/browser/android/search_permissions/search_permissions_service.h"
#include "chrome/browser/android/webapps/webapp_registry.h" #include "chrome/browser/android/webapps/webapp_registry.h"
#include "components/feed/buildflags.h"
#else // !defined(OS_ANDROID) #else // !defined(OS_ANDROID)
#include "components/safe_browsing/password_protection/mock_password_protection_service.h" #include "components/safe_browsing/password_protection/mock_password_protection_service.h"
#include "content/public/browser/host_zoom_map.h" #include "content/public/browser/host_zoom_map.h"
...@@ -2958,6 +2959,7 @@ TEST_F(ChromeBrowsingDataRemoverDelegateTest, WipeOriginVerifierData) { ...@@ -2958,6 +2959,7 @@ TEST_F(ChromeBrowsingDataRemoverDelegateTest, WipeOriginVerifierData) {
customtabs::OriginVerifier::GetClearBrowsingDataCallCountForTesting()); customtabs::OriginVerifier::GetClearBrowsingDataCallCountForTesting());
} }
#if BUILDFLAG(ENABLE_FEED_IN_CHROME)
TEST_F(ChromeBrowsingDataRemoverDelegateTest, FeedClearsLastFetchAttempt) { TEST_F(ChromeBrowsingDataRemoverDelegateTest, FeedClearsLastFetchAttempt) {
PrefService* prefs = GetProfile()->GetPrefs(); PrefService* prefs = GetProfile()->GetPrefs();
prefs->SetTime(feed::prefs::kLastFetchAttemptTime, base::Time::Now()); prefs->SetTime(feed::prefs::kLastFetchAttemptTime, base::Time::Now());
...@@ -2968,4 +2970,5 @@ TEST_F(ChromeBrowsingDataRemoverDelegateTest, FeedClearsLastFetchAttempt) { ...@@ -2968,4 +2970,5 @@ TEST_F(ChromeBrowsingDataRemoverDelegateTest, FeedClearsLastFetchAttempt) {
EXPECT_EQ(base::Time(), prefs->GetTime(feed::prefs::kLastFetchAttemptTime)); EXPECT_EQ(base::Time(), prefs->GetTime(feed::prefs::kLastFetchAttemptTime));
} }
#endif // BUILDFLAG(ENABLE_FEED_IN_CHROME)
#endif // defined(OS_ANDROID) #endif // defined(OS_ANDROID)
...@@ -50,6 +50,7 @@ ...@@ -50,6 +50,7 @@
#if defined(OS_ANDROID) #if defined(OS_ANDROID)
#include "chrome/browser/android/contextual_suggestions/contextual_suggestions_prefs.h" #include "chrome/browser/android/contextual_suggestions/contextual_suggestions_prefs.h"
#include "components/feed/buildflags.h"
#include "components/feed/core/pref_names.h" #include "components/feed/core/pref_names.h"
#endif // defined(OS_ANDROID) #endif // defined(OS_ANDROID)
...@@ -82,7 +83,6 @@ namespace { ...@@ -82,7 +83,6 @@ namespace {
// storage default, from on disk to in memory. All items in this list will be // storage default, from on disk to in memory. All items in this list will be
// audited and checked with owners and removed from whitelist. // audited and checked with owners and removed from whitelist.
const char* incognito_whitelist[] = { const char* incognito_whitelist[] = {
// ash/public/cpp/ash_pref_names.h // ash/public/cpp/ash_pref_names.h
#if defined(OS_CHROMEOS) #if defined(OS_CHROMEOS)
ash::prefs::kAccessibilityLargeCursorEnabled, ash::prefs::kAccessibilityLargeCursorEnabled,
...@@ -1082,11 +1082,13 @@ const char* incognito_whitelist[] = { ...@@ -1082,11 +1082,13 @@ const char* incognito_whitelist[] = {
// components/feed/core/pref_names.h // components/feed/core/pref_names.h
#if defined(OS_ANDROID) #if defined(OS_ANDROID)
#if BUILDFLAG(ENABLE_FEED_IN_CHROME)
feed::prefs::kBackgroundRefreshPeriod, feed::prefs::kLastFetchAttemptTime, feed::prefs::kBackgroundRefreshPeriod, feed::prefs::kLastFetchAttemptTime,
feed::prefs::kUserClassifierAverageNTPOpenedPerHour, feed::prefs::kUserClassifierAverageNTPOpenedPerHour,
feed::prefs::kUserClassifierAverageSuggestionsUsedPerHour, feed::prefs::kUserClassifierAverageSuggestionsUsedPerHour,
feed::prefs::kUserClassifierLastTimeToOpenNTP, feed::prefs::kUserClassifierLastTimeToOpenNTP,
feed::prefs::kUserClassifierLastTimeToUseSuggestions, feed::prefs::kUserClassifierLastTimeToUseSuggestions,
#endif // BUILDFLAG(ENABLE_FEED_IN_CHROME)
#endif // defined(OS_ANDROID) #endif // defined(OS_ANDROID)
// components/flags_ui/flags_ui_pref_names.h // components/flags_ui/flags_ui_pref_names.h
......
...@@ -3,5 +3,6 @@ ...@@ -3,5 +3,6 @@
# found in the LICENSE file. # found in the LICENSE file.
declare_args() { declare_args() {
enable_feed_in_chrome = is_android # Temporarily compile out Feed while M69 branches to avoid bloating binary.
enable_feed_in_chrome = false
} }
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