Remove more Client LoFi code

Removes:
* feature
* previews type
* assoc params
* triggering logic

PreviewsState bit will come in the next CL.

Bug: 944286
Change-Id: I65410f30d1efa574a391d61723fd6788b2d2d66d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1642018
Commit-Queue: Robert Ogden <robertogden@chromium.org>
Reviewed-by: Ryan Sturm <ryansturm@chromium.org>
Cr-Commit-Position: refs/heads/master@{#667188}

chrome/browser/page_load_metrics/observers/data_saver_site_breakdown_metrics_observer_browsertest.cc

@@ -59,8 +59,7 @@ class DataSaverSiteBreakdownMetricsObserverBrowserTest
     : public InProcessBrowserTest {
  protected:
   void SetUp() override {
-    scoped_feature_list_.InitWithFeatures(
-        {previews::features::kClientLoFi, features::kLazyImageLoading}, {});
+    scoped_feature_list_.InitWithFeatures({features::kLazyImageLoading}, {});
     InProcessBrowserTest::SetUp();
   }
 

chrome/browser/previews/previews_content_util.cc

@@ -294,12 +294,6 @@ content::PreviewsState DetermineAllowedClientPreviewsState(
     previews_state |= content::LITE_PAGE_REDIRECT_ON;
   }
 
-  if (previews::params::IsClientLoFiEnabled() &&
-      previews_decider->ShouldAllowPreviewAtNavigationStart(
-          previews_data, url, is_reload, previews::PreviewsType::LOFI)) {
-    previews_state |= content::CLIENT_LOFI_ON;
-  }
-
   return previews_state;
 }
 
@@ -427,10 +421,6 @@ content::PreviewsState DetermineCommittedClientPreviewsState(
     // commit to it.
     previews_state = previews_state & ~content::NOSCRIPT_ON;
   }
-  if (previews_state & content::CLIENT_LOFI_ON) {
-    LogCommittedPreview(previews_data, PreviewsType::LOFI);
-    return content::CLIENT_LOFI_ON;
-  }
 
   if (!previews_state) {
     return content::PREVIEWS_OFF;
@@ -525,14 +515,10 @@ previews::PreviewsType GetMainFramePreviewsType(
     return previews::PreviewsType::LITE_PAGE_REDIRECT;
   if (previews_state & content::SERVER_LITE_PAGE_ON)
     return previews::PreviewsType::LITE_PAGE;
-  if (previews_state & content::SERVER_LOFI_ON)
-    return previews::PreviewsType::LOFI;
   if (previews_state & content::RESOURCE_LOADING_HINTS_ON)
     return previews::PreviewsType::RESOURCE_LOADING_HINTS;
   if (previews_state & content::NOSCRIPT_ON)
     return previews::PreviewsType::NOSCRIPT;
-  if (previews_state & content::CLIENT_LOFI_ON)
-    return previews::PreviewsType::LOFI;
 
   DCHECK_EQ(content::PREVIEWS_UNSPECIFIED,
             previews_state & ~content::CLIENT_LOFI_AUTO_RELOAD &

chrome/browser/previews/previews_service.cc

@@ -38,8 +38,8 @@ bool IsPreviewsTypeEnabled(previews::PreviewsType type) {
   switch (type) {
     case previews::PreviewsType::OFFLINE:
       return previews::params::IsOfflinePreviewsEnabled();
-    case previews::PreviewsType::LOFI:
-      return server_previews_enabled || previews::params::IsClientLoFiEnabled();
+    case previews::PreviewsType::DEPRECATED_LOFI:
+      return false;
     case previews::PreviewsType::LITE_PAGE_REDIRECT:
       return previews::params::IsLitePageServerPreviewsEnabled();
     case previews::PreviewsType::LITE_PAGE:
@@ -69,8 +69,6 @@ int GetPreviewsTypeVersion(previews::PreviewsType type) {
   switch (type) {
     case previews::PreviewsType::OFFLINE:
       return previews::params::OfflinePreviewsVersion();
-    case previews::PreviewsType::LOFI:
-      return previews::params::ClientLoFiVersion();
     case previews::PreviewsType::LITE_PAGE:
       return data_reduction_proxy::params::LitePageVersion();
     case previews::PreviewsType::LITE_PAGE_REDIRECT:
@@ -85,6 +83,7 @@ int GetPreviewsTypeVersion(previews::PreviewsType type) {
     case previews::PreviewsType::UNSPECIFIED:
     case previews::PreviewsType::LAST:
     case previews::PreviewsType::DEPRECATED_AMP_REDIRECTION:
+    case previews::PreviewsType::DEPRECATED_LOFI:
       break;
   }
   NOTREACHED();

chrome/browser/previews/previews_service_unittest.cc

@@ -53,50 +53,6 @@ TEST_F(PreviewsServiceTest, TestOfflineFeatureDisabled) {
             allowed_types_and_versions.end());
 }
 
-TEST_F(PreviewsServiceTest, TestClientLoFiFeatureEnabled) {
-  base::test::ScopedFeatureList scoped_feature_list;
-  scoped_feature_list.InitWithFeatures(
-      {previews::features::kPreviews,
-       previews::features::kClientLoFi} /* enabled features */,
-      {data_reduction_proxy::features::
-           kDataReductionProxyDecidesTransform} /* disabled features */);
-
-  blacklist::BlacklistData::AllowedTypesAndVersions allowed_types_and_versions =
-      PreviewsService::GetAllowedPreviews();
-  EXPECT_NE(allowed_types_and_versions.find(
-                static_cast<int>(previews::PreviewsType::LOFI)),
-            allowed_types_and_versions.end());
-}
-
-TEST_F(PreviewsServiceTest, TestClientLoFiAndServerLoFiEnabled) {
-  base::test::ScopedFeatureList scoped_feature_list;
-  scoped_feature_list.InitWithFeatures(
-      {previews::features::kPreviews, previews::features::kClientLoFi,
-       data_reduction_proxy::features::
-           kDataReductionProxyDecidesTransform} /* enabled features */,
-      {} /* disabled features */);
-
-  blacklist::BlacklistData::AllowedTypesAndVersions allowed_types_and_versions =
-      PreviewsService::GetAllowedPreviews();
-  EXPECT_NE(allowed_types_and_versions.find(
-                static_cast<int>(previews::PreviewsType::LOFI)),
-            allowed_types_and_versions.end());
-}
-
-TEST_F(PreviewsServiceTest, TestClientLoFiAndServerLoFiNotEnabled) {
-  base::test::ScopedFeatureList scoped_feature_list;
-  scoped_feature_list.InitWithFeatures(
-      {previews::features::kPreviews} /* enabled features */,
-      {previews::features::kClientLoFi,
-       data_reduction_proxy::features::
-           kDataReductionProxyDecidesTransform} /* disabled features */);
-  blacklist::BlacklistData::AllowedTypesAndVersions allowed_types_and_versions =
-      PreviewsService::GetAllowedPreviews();
-  EXPECT_EQ(allowed_types_and_versions.find(
-                static_cast<int>(previews::PreviewsType::LOFI)),
-            allowed_types_and_versions.end());
-}
-
 TEST_F(PreviewsServiceTest, TestLitePageNotEnabled) {
   base::test::ScopedFeatureList scoped_feature_list;
   scoped_feature_list.InitWithFeatures(
@@ -110,19 +66,6 @@ TEST_F(PreviewsServiceTest, TestLitePageNotEnabled) {
             allowed_types_and_versions.end());
 }
 
-TEST_F(PreviewsServiceTest, TestServerLoFiProxyDecidesTransform) {
-  base::test::ScopedFeatureList scoped_feature_list;
-  scoped_feature_list.InitWithFeatures(
-      {previews::features::kPreviews,
-       data_reduction_proxy::features::kDataReductionProxyDecidesTransform},
-      {});
-  blacklist::BlacklistData::AllowedTypesAndVersions allowed_types_and_versions =
-      PreviewsService::GetAllowedPreviews();
-  EXPECT_NE(allowed_types_and_versions.find(
-                static_cast<int>(previews::PreviewsType::LOFI)),
-            allowed_types_and_versions.end());
-}
-
 TEST_F(PreviewsServiceTest, TestLitePageProxyDecidesTransform) {
   base::test::ScopedFeatureList scoped_feature_list;
   scoped_feature_list.InitWithFeatures(

chrome/browser/previews/previews_ui_tab_helper.cc

@@ -210,13 +210,11 @@ void PreviewsUITabHelper::ReloadWithoutPreviews(
       web_contents()->GetController().Reload(
           content::ReloadType::ORIGINAL_REQUEST_URL, true);
       break;
-    case previews::PreviewsType::LOFI:
-      web_contents()->ReloadLoFiImages();
-      break;
     case previews::PreviewsType::NONE:
     case previews::PreviewsType::UNSPECIFIED:
     case previews::PreviewsType::LAST:
     case previews::PreviewsType::DEPRECATED_AMP_REDIRECTION:
+    case previews::PreviewsType::DEPRECATED_LOFI:
       NOTREACHED();
       break;
   }

chrome/browser/previews/previews_ui_tab_helper_unittest.cc

@@ -188,32 +188,6 @@ TEST_F(PreviewsUITabHelperUnitTest,
   EXPECT_FALSE(ui_tab_helper->displayed_preview_ui());
 }
 
-TEST_F(PreviewsUITabHelperUnitTest,
-       DidFinishNavigationDoesCreateLoFiPreviewsUI) {
-  PreviewsUITabHelper* ui_tab_helper =
-      PreviewsUITabHelper::FromWebContents(web_contents());
-  EXPECT_FALSE(ui_tab_helper->displayed_preview_ui());
-
-  SetCommittedPreviewsType(previews::PreviewsType::LOFI);
-  SimulateWillProcessResponse();
-  CallDidFinishNavigation();
-  base::RunLoop().RunUntilIdle();
-
-#if defined(OS_ANDROID)
-  EXPECT_TRUE(ui_tab_helper->should_display_android_omnibox_badge());
-#endif
-  EXPECT_TRUE(ui_tab_helper->displayed_preview_ui());
-
-  // Navigate to reset the displayed state.
-  content::WebContentsTester::For(web_contents())
-      ->NavigateAndCommit(GURL(kTestUrl));
-
-#if defined(OS_ANDROID)
-  EXPECT_FALSE(ui_tab_helper->should_display_android_omnibox_badge());
-#endif
-  EXPECT_FALSE(ui_tab_helper->displayed_preview_ui());
-}
-
 TEST_F(PreviewsUITabHelperUnitTest, TestPreviewsIDSet) {
   PreviewsUITabHelper* ui_tab_helper =
       PreviewsUITabHelper::FromWebContents(web_contents());

chrome/browser/ui/webui/interventions_internals/interventions_internals_page_handler.cc

@@ -28,7 +28,6 @@ namespace {
 // HTML DOM ID used in the JavaScript code. The IDs are generated here so that
 // the DOM would have sensible name instead of autogenerated IDs.
 const char kPreviewsAllowedHtmlId[] = "previews-allowed-status";
-const char kClientLoFiPreviewsHtmlId[] = "client-lofi-preview-status";
 const char kLitePageRedirectHtmlId[] = "lite-page-redirect-status";
 const char kNoScriptPreviewsHtmlId[] = "noscript-preview-status";
 const char kResourceLoadingHintsHtmlId[] = "resource-loading-hints-status";
@@ -36,7 +35,6 @@ const char kOfflinePreviewsHtmlId[] = "offline-preview-status";
 
 // Descriptions for previews.
 const char kPreviewsAllowedDescription[] = "Previews Allowed";
-const char kClientLoFiDescription[] = "Client LoFi Previews";
 const char kLitePageRedirectDescription[] =
     "Lite Page Redirect / Server Previews";
 const char kNoScriptDescription[] = "NoScript Previews";
@@ -249,12 +247,6 @@ void InterventionsInternalsPageHandler::GetPreviewsEnabled(
   noscript_status->htmlId = kNoScriptPreviewsHtmlId;
   statuses.push_back(std::move(noscript_status));
 
-  auto client_lofi_status = mojom::PreviewsStatus::New();
-  client_lofi_status->description = kClientLoFiDescription;
-  client_lofi_status->enabled = previews::params::IsClientLoFiEnabled();
-  client_lofi_status->htmlId = kClientLoFiPreviewsHtmlId;
-  statuses.push_back(std::move(client_lofi_status));
-
   std::move(callback).Run(std::move(statuses));
 }
 

chrome/browser/ui/webui/interventions_internals/interventions_internals_page_handler_unittest.cc

@@ -55,7 +55,6 @@ constexpr char kOfflinePreviewsHtmlId[] = "offline-preview-status";
 constexpr char kLitePageRedirectHtmlId[] = "lite-page-redirect-status";
 constexpr char kResourceLoadingHintsHtmlId[] = "resource-loading-hints-status";
 constexpr char kNoScriptPreviewsHtmlId[] = "noscript-preview-status";
-constexpr char kClientLoFiPreviewsHtmlId[] = "client-lofi-preview-status";
 
 // Descriptions for previews.
 constexpr char kPreviewsAllowedDescription[] = "Previews Allowed";
@@ -65,7 +64,6 @@ constexpr char kLitePageRedirectDescription[] =
 constexpr char kResourceLoadingHintsDescription[] =
     "ResourceLoadingHints Previews";
 constexpr char kNoScriptDescription[] = "NoScript Previews";
-constexpr char kClientLoFiDescription[] = "Client LoFi Previews";
 
 // The HTML DOM ID used in Javascript.
 constexpr char kOfflinePageFlagHtmlId[] = "offline-page-flag";
@@ -327,7 +325,7 @@ TEST_F(InterventionsInternalsPageHandlerTest, GetPreviewsEnabledCount) {
   page_handler_->GetPreviewsEnabled(
       base::BindOnce(&MockGetPreviewsEnabledCallback));
 
-  constexpr size_t expected = 6;
+  constexpr size_t expected = 5;
   EXPECT_EQ(expected, passed_in_modes.size());
 }
 
@@ -355,30 +353,6 @@ TEST_F(InterventionsInternalsPageHandlerTest, PreviewsAllowedEnabled) {
   EXPECT_TRUE(previews_allowed->second->enabled);
 }
 
-TEST_F(InterventionsInternalsPageHandlerTest, ClientLoFiDisabled) {
-  // Init with kClientLoFi disabled.
-  scoped_feature_list_->InitWithFeatures({}, {previews::features::kClientLoFi});
-
-  page_handler_->GetPreviewsEnabled(
-      base::BindOnce(&MockGetPreviewsEnabledCallback));
-  auto client_lofi = passed_in_modes.find(kClientLoFiPreviewsHtmlId);
-  ASSERT_NE(passed_in_modes.end(), client_lofi);
-  EXPECT_EQ(kClientLoFiDescription, client_lofi->second->description);
-  EXPECT_FALSE(client_lofi->second->enabled);
-}
-
-TEST_F(InterventionsInternalsPageHandlerTest, ClientLoFiEnabled) {
-  // Init with kClientLoFi enabled.
-  scoped_feature_list_->InitWithFeatures({previews::features::kClientLoFi}, {});
-
-  page_handler_->GetPreviewsEnabled(
-      base::BindOnce(&MockGetPreviewsEnabledCallback));
-  auto client_lofi = passed_in_modes.find(kClientLoFiPreviewsHtmlId);
-  ASSERT_NE(passed_in_modes.end(), client_lofi);
-  EXPECT_EQ(kClientLoFiDescription, client_lofi->second->description);
-  EXPECT_TRUE(client_lofi->second->enabled);
-}
-
 TEST_F(InterventionsInternalsPageHandlerTest, NoScriptDisabled) {
   // Init with kNoScript disabled.
   scoped_feature_list_->InitWithFeatures(

components/previews/content/previews_decider_impl.cc

@@ -55,12 +55,12 @@ bool ShouldCheckOptimizationHints(PreviewsType type) {
     // These types do not have server optimization hints.
     case PreviewsType::OFFLINE:
     case PreviewsType::LITE_PAGE:
-    case PreviewsType::LOFI:
     case PreviewsType::DEFER_ALL_SCRIPT:
       return false;
     case PreviewsType::NONE:
     case PreviewsType::UNSPECIFIED:
     case PreviewsType::DEPRECATED_AMP_REDIRECTION:
+    case PreviewsType::DEPRECATED_LOFI:
     case PreviewsType::LAST:
       break;
   }
@@ -76,7 +76,6 @@ bool CheckECTOnlyAtCommitTime(PreviewsType type) {
     case PreviewsType::RESOURCE_LOADING_HINTS:
     case PreviewsType::DEFER_ALL_SCRIPT:
       return true;
-    case PreviewsType::LOFI:
     case PreviewsType::LITE_PAGE_REDIRECT:
     case PreviewsType::OFFLINE:
     case PreviewsType::LITE_PAGE:
@@ -84,6 +83,7 @@ bool CheckECTOnlyAtCommitTime(PreviewsType type) {
     case PreviewsType::NONE:
     case PreviewsType::UNSPECIFIED:
     case PreviewsType::DEPRECATED_AMP_REDIRECTION:
+    case PreviewsType::DEPRECATED_LOFI:
     case PreviewsType::LAST:
       break;
   }

components/previews/content/previews_hints_unittest.cc

@@ -276,7 +276,7 @@ TEST_F(PreviewsHintsTest, IsBlacklistedReturnsTrueIfNoBloomFilter) {
   EXPECT_FALSE(HasLitePageRedirectBlacklist());
 
   EXPECT_FALSE(previews_hints()->IsBlacklisted(GURL("https://black.com/path"),
-                                               PreviewsType::LOFI));
+                                               PreviewsType::OFFLINE));
 
   EXPECT_TRUE(previews_hints()->IsBlacklisted(
       GURL("https://black.com/path"), PreviewsType::LITE_PAGE_REDIRECT));
@@ -302,7 +302,7 @@ TEST_F(PreviewsHintsTest, IsBlacklisted) {
 
   EXPECT_TRUE(HasLitePageRedirectBlacklist());
   EXPECT_FALSE(previews_hints()->IsBlacklisted(GURL("https://black.com/path"),
-                                               PreviewsType::LOFI));
+                                               PreviewsType::OFFLINE));
   EXPECT_TRUE(previews_hints()->IsBlacklisted(
       GURL("https://black.com/path"), PreviewsType::LITE_PAGE_REDIRECT));
   EXPECT_TRUE(previews_hints()->IsBlacklisted(

components/previews/content/previews_ui_service_unittest.cc

@@ -233,7 +233,7 @@ TEST_F(PreviewsUIServiceTest, TestInitialization) {
 
 TEST_F(PreviewsUIServiceTest, TestLogPreviewNavigationPassInCorrectParams) {
   const GURL url_a = GURL("http://www.url_a.com/url_a");
-  const PreviewsType type_a = PreviewsType::LOFI;
+  const PreviewsType type_a = PreviewsType::LITE_PAGE;
   const bool opt_out_a = true;
   const base::Time time_a = base::Time::Now();
   const uint64_t page_id_a = 1234;
@@ -298,7 +298,7 @@ TEST_F(PreviewsUIServiceTest, TestLogPreviewDecisionMadePassesCorrectParams) {
       PreviewsEligibilityReason::NETWORK_NOT_SLOW;
   const GURL url_b("http://www.url_b.com/url_b");
   const base::Time time_b = base::Time::Now();
-  PreviewsType type_b = PreviewsType::LOFI;
+  PreviewsType type_b = PreviewsType::OFFLINE;
   std::vector<PreviewsEligibilityReason> passed_reasons_b = {
       PreviewsEligibilityReason::HOST_NOT_WHITELISTED_BY_SERVER,
       PreviewsEligibilityReason::NETWORK_QUALITY_UNAVAILABLE,

components/previews/core/previews_experiments.cc

@@ -277,10 +277,6 @@ net::EffectiveConnectionType GetECTThresholdForPreview(
       return GetParamValueAsECT(kClientSidePreviewsFieldTrial,
                                 kEffectiveConnectionTypeThreshold,
                                 net::EFFECTIVE_CONNECTION_TYPE_2G);
-    case PreviewsType::LOFI:
-      return GetParamValueAsECTByFeature(features::kClientLoFi,
-                                         kEffectiveConnectionTypeThreshold,
-                                         net::EFFECTIVE_CONNECTION_TYPE_2G);
     case PreviewsType::LITE_PAGE:
       NOTREACHED();
       break;
@@ -295,6 +291,7 @@ net::EffectiveConnectionType GetECTThresholdForPreview(
                                          kEffectiveConnectionTypeThreshold,
                                          net::EFFECTIVE_CONNECTION_TYPE_2G);
     case PreviewsType::DEPRECATED_AMP_REDIRECTION:
+    case PreviewsType::DEPRECATED_LOFI:
     case PreviewsType::LAST:
       break;
   }
@@ -316,10 +313,6 @@ bool IsOfflinePreviewsEnabled() {
   return base::FeatureList::IsEnabled(features::kOfflinePreviews);
 }
 
-bool IsClientLoFiEnabled() {
-  return base::FeatureList::IsEnabled(features::kClientLoFi);
-}
-
 bool IsNoScriptPreviewsEnabled() {
   return base::FeatureList::IsEnabled(features::kNoScriptPreviews);
 }
@@ -340,11 +333,6 @@ int OfflinePreviewsVersion() {
   return GetParamValueAsInt(kClientSidePreviewsFieldTrial, kVersion, 0);
 }
 
-int ClientLoFiVersion() {
-  return base::GetFieldTrialParamByFeatureAsInt(features::kClientLoFi, kVersion,
-                                                0);
-}
-
 int LitePageServerPreviewsVersion() {
   return base::GetFieldTrialParamByFeatureAsInt(
       features::kLitePageServerPreviews, kVersion, 0);
@@ -453,8 +441,6 @@ std::string GetStringNameForType(PreviewsType type) {
       return "None";
     case PreviewsType::OFFLINE:
       return "Offline";
-    case PreviewsType::LOFI:
-      return "LoFi";
     case PreviewsType::LITE_PAGE:
       return "LitePage";
     case PreviewsType::LITE_PAGE_REDIRECT:
@@ -468,6 +454,7 @@ std::string GetStringNameForType(PreviewsType type) {
     case PreviewsType::DEFER_ALL_SCRIPT:
       return "DeferAllScript";
     case PreviewsType::DEPRECATED_AMP_REDIRECTION:
+    case PreviewsType::DEPRECATED_LOFI:
     case PreviewsType::LAST:
       break;
   }

components/previews/core/previews_experiments.h

@@ -22,8 +22,8 @@ enum class PreviewsType {
   // The user is shown an offline page as a preview.
   OFFLINE = 1,
 
-  // Replace images with placeholders.
-  LOFI = 2,
+  // Replace images with placeholders. Deprecated, and should not be used.
+  DEPRECATED_LOFI = 2,
 
   // The user is shown a server lite page.
   LITE_PAGE = 3,
@@ -170,7 +170,6 @@ bool ArePreviewsAllowed();
 
 // Whether the preview type is enabled.
 bool IsOfflinePreviewsEnabled();
-bool IsClientLoFiEnabled();
 bool IsNoScriptPreviewsEnabled();
 bool IsResourceLoadingHintsEnabled();
 bool IsLitePageServerPreviewsEnabled();
@@ -178,7 +177,6 @@ bool IsDeferAllScriptPreviewsEnabled();
 
 // The blacklist version for each preview type.
 int OfflinePreviewsVersion();
-int ClientLoFiVersion();
 int LitePageServerPreviewsVersion();
 int NoScriptPreviewsVersion();
 int ResourceLoadingHintsVersion();

components/previews/core/previews_experiments_unittest.cc

@@ -87,44 +87,6 @@ TEST(PreviewsExperimentsTest, TestParamsForBlackListAndOffline) {
   variations::testing::ClearAllVariationParams();
 }
 
-TEST(PreviewsExperimentsTest, TestClientLoFiDisabledByDefault) {
-  EXPECT_FALSE(params::IsClientLoFiEnabled());
-}
-
-TEST(PreviewsExperimentsTest, TestClientLoFiExplicitlyDisabled) {
-  base::test::ScopedFeatureList scoped_feature_list;
-  scoped_feature_list.InitAndDisableFeature(features::kClientLoFi);
-  EXPECT_FALSE(params::IsClientLoFiEnabled());
-}
-
-TEST(PreviewsExperimentsTest, TestClientLoFiExplicitlyEnabled) {
-  base::test::ScopedFeatureList scoped_feature_list;
-  scoped_feature_list.InitAndEnableFeature(features::kClientLoFi);
-  EXPECT_TRUE(params::IsClientLoFiEnabled());
-}
-
-TEST(PreviewsExperimentsTest, TestEnableClientLoFiWithDefaultParams) {
-  base::test::ScopedFeatureList scoped_feature_list;
-  scoped_feature_list.InitAndEnableFeature(features::kClientLoFi);
-
-  EXPECT_TRUE(params::IsClientLoFiEnabled());
-  EXPECT_EQ(0, params::ClientLoFiVersion());
-  EXPECT_EQ(net::EFFECTIVE_CONNECTION_TYPE_2G,
-            params::GetECTThresholdForPreview(PreviewsType::LOFI));
-}
-
-TEST(PreviewsExperimentsTest, TestEnableClientLoFiWithCustomParams) {
-  base::test::ScopedFeatureList scoped_feature_list;
-  scoped_feature_list.InitAndEnableFeatureWithParameters(
-      features::kClientLoFi,
-      {{"version", "10"}, {"max_allowed_effective_connection_type", "3G"}});
-
-  EXPECT_TRUE(params::IsClientLoFiEnabled());
-  EXPECT_EQ(10, params::ClientLoFiVersion());
-  EXPECT_EQ(net::EFFECTIVE_CONNECTION_TYPE_3G,
-            params::GetECTThresholdForPreview(PreviewsType::LOFI));
-}
-
 TEST(PreviewsExperimentsTest, TestDefaultShouldExcludeMediaSuffix) {
   base::test::ScopedFeatureList scoped_feature_list;
   scoped_feature_list.InitAndEnableFeature(features::kExcludedMediaSuffixes);

components/previews/core/previews_features.cc

@@ -26,10 +26,6 @@ const base::Feature kPreviews {
 const base::Feature kOfflinePreviews{"OfflinePreviews",
                                      base::FEATURE_ENABLED_BY_DEFAULT};
 
-// Enables the Client Lo-Fi previews.
-const base::Feature kClientLoFi{"ClientLoFi",
-                                base::FEATURE_DISABLED_BY_DEFAULT};
-
 // Enables the NoScript previews for Android.
 const base::Feature kNoScriptPreviews {
   "NoScriptPreviews",

components/previews/core/previews_features.h

@@ -12,7 +12,6 @@ namespace features {
 
 extern const base::Feature kPreviews;
 extern const base::Feature kOfflinePreviews;
-extern const base::Feature kClientLoFi;
 extern const base::Feature kNoScriptPreviews;
 extern const base::Feature kStalePreviewsTimestamp;
 extern const base::Feature kOptimizationHints;

components/previews/core/previews_logger_unittest.cc

@@ -158,7 +158,7 @@ TEST_F(PreviewsLoggerTest, LogPreviewDecisionMadeLogMessage) {
   const base::Time time = base::Time::Now();
 
   PreviewsType type_a = PreviewsType::OFFLINE;
-  PreviewsType type_b = PreviewsType::LOFI;
+  PreviewsType type_b = PreviewsType::LITE_PAGE;
   PreviewsEligibilityReason reason_a =
       PreviewsEligibilityReason::BLACKLIST_UNAVAILABLE;
   std::vector<PreviewsEligibilityReason> passed_reasons_a = {};
@@ -193,21 +193,22 @@ TEST_F(PreviewsLoggerTest, LogPreviewDecisionMadeLogMessage) {
   EXPECT_EQ(time, actual[0].time);
   EXPECT_EQ(page_id_a, actual[0].page_id);
 
-  std::string expected_passed_0 = "LoFi preview - Network quality available";
+  std::string expected_passed_0 =
+      "LitePage preview - Network quality available";
   EXPECT_EQ(kPreviewsDecisionMadeEventType, actual[1].event_type);
   EXPECT_EQ(expected_passed_0, actual[1].event_description);
   EXPECT_EQ(url_b, actual[1].url);
   EXPECT_EQ(time, actual[1].time);
   EXPECT_EQ(page_id_b, actual[1].page_id);
 
-  std::string expected_passed_1 = "LoFi preview - Page reloads allowed";
+  std::string expected_passed_1 = "LitePage preview - Page reloads allowed";
   EXPECT_EQ(kPreviewsDecisionMadeEventType, actual[2].event_type);
   EXPECT_EQ(expected_passed_1, actual[2].event_description);
   EXPECT_EQ(url_b, actual[2].url);
   EXPECT_EQ(time, actual[2].time);
   EXPECT_EQ(page_id_b, actual[2].page_id);
 
-  std::string expected_description_b = "LoFi preview - Network not slow";
+  std::string expected_description_b = "LitePage preview - Network not slow";
   EXPECT_EQ(kPreviewsDecisionMadeEventType, actual[3].event_type);
   EXPECT_EQ(expected_description_b, actual[3].event_description);
   EXPECT_EQ(url_b, actual[3].url);
@@ -219,7 +220,7 @@ TEST_F(PreviewsLoggerTest, LogPreviewNavigationLogMessage) {
   const base::Time time = base::Time::Now();
 
   PreviewsType type_a = PreviewsType::OFFLINE;
-  PreviewsType type_b = PreviewsType::LOFI;
+  PreviewsType type_b = PreviewsType::LITE_PAGE;
   const GURL url_a("http://www.url_a.com/url_a");
   const GURL url_b("http://www.url_b.com/url_b");
   const uint64_t page_id_a = 1234;
@@ -245,7 +246,7 @@ TEST_F(PreviewsLoggerTest, LogPreviewNavigationLogMessage) {
   EXPECT_EQ(time, actual[0].time);
   EXPECT_EQ(page_id_a, actual[0].page_id);
 
-  std::string expected_description_b = "LoFi preview - user opt-out: False";
+  std::string expected_description_b = "LitePage preview - user opt-out: False";
   EXPECT_EQ(kPreviewsNavigationEventType, actual[1].event_type);
   EXPECT_EQ(expected_description_b, actual[1].event_description);
   EXPECT_EQ(url_b, actual[1].url);
@@ -295,7 +296,7 @@ TEST_F(PreviewsLoggerTest,
                       GURL("http://www.url_.com/url_"), base::Time::Now(),
                       1234 /* page_id */);
 
-  PreviewsType type = PreviewsType::LOFI;
+  PreviewsType type = PreviewsType::OFFLINE;
   PreviewsEligibilityReason final_reason =
       PreviewsEligibilityReason::BLACKLIST_UNAVAILABLE;
   std::vector<PreviewsEligibilityReason> passed_reasons = {