Commit e7724e2e authored by Robbie Gibson's avatar Robbie Gibson Committed by Commit Bot

Enable NTP ZPS by default on iOS

The experiment has performed well at 50%, and we are ready to ramp to
100%.

Bug: 1056781
Change-Id: I17ff0d44e3b5a8ba5dcc54d7b520e7484890a1c4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2380656
Commit-Queue: Robbie Gibson <rkgibson@google.com>
Reviewed-by: default avatarTommy Li <tommycli@chromium.org>
Cr-Commit-Position: refs/heads/master@{#813134}
parent 7d5c54f6
...@@ -725,11 +725,10 @@ ZeroSuggestProvider::ResultType ZeroSuggestProvider::TypeOfResultToRun( ...@@ -725,11 +725,10 @@ ZeroSuggestProvider::ResultType ZeroSuggestProvider::TypeOfResultToRun(
if (base::Contains(field_trial_variants, kMostVisitedVariant)) if (base::Contains(field_trial_variants, kMostVisitedVariant))
return MOST_VISITED; return MOST_VISITED;
#if !defined(OS_IOS) // For Desktop, Android, and iOS, default to REMOTE_NO_URL on the NTP, if
// For Desktop and Android, default to REMOTE_NO_URL on the NTP, if allowed. // allowed.
if (IsNTPPage(current_page_classification) && remote_no_url_allowed) if (IsNTPPage(current_page_classification) && remote_no_url_allowed)
return REMOTE_NO_URL; return REMOTE_NO_URL;
#endif
#if defined(OS_ANDROID) || defined(OS_IOS) #if defined(OS_ANDROID) || defined(OS_IOS)
// For Android and iOS, default to MOST_VISITED everywhere except on the SERP. // For Android and iOS, default to MOST_VISITED everywhere except on the SERP.
......
...@@ -279,7 +279,7 @@ TEST_F(ZeroSuggestProviderTest, TypeOfResultToRun) { ...@@ -279,7 +279,7 @@ TEST_F(ZeroSuggestProviderTest, TypeOfResultToRun) {
? ZeroSuggestProvider::ResultType::REMOTE_NO_URL ? ZeroSuggestProvider::ResultType::REMOTE_NO_URL
: ZeroSuggestProvider::ResultType::NONE, : ZeroSuggestProvider::ResultType::NONE,
result_type); result_type);
#elif !defined(OS_IOS) // Android #else // Android and iOS
EXPECT_EQ(BaseSearchProvider::IsNTPPage(current_page_classification) && EXPECT_EQ(BaseSearchProvider::IsNTPPage(current_page_classification) &&
remote_no_url_allowed remote_no_url_allowed
? ZeroSuggestProvider::ResultType::REMOTE_NO_URL ? ZeroSuggestProvider::ResultType::REMOTE_NO_URL
...@@ -288,12 +288,6 @@ TEST_F(ZeroSuggestProviderTest, TypeOfResultToRun) { ...@@ -288,12 +288,6 @@ TEST_F(ZeroSuggestProviderTest, TypeOfResultToRun) {
? ZeroSuggestProvider::ResultType::MOST_VISITED ? ZeroSuggestProvider::ResultType::MOST_VISITED
: ZeroSuggestProvider::ResultType::NONE, : ZeroSuggestProvider::ResultType::NONE,
result_type); result_type);
#else // iOS
EXPECT_EQ(!BaseSearchProvider::IsSearchResultsPage(
current_page_classification)
? ZeroSuggestProvider::ResultType::MOST_VISITED
: ZeroSuggestProvider::ResultType::NONE,
result_type);
#endif #endif
}; };
......
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