Use the Previews Black List for server previews

chrome/browser/previews/previews_infobar_delegate.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/previews/previews_infobar_delegate.h"
 
 #include "base/metrics/histogram_macros.h"
 #include "base/optional.h"
 #include "chrome/browser/android/android_theme_resources.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h"
 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_factory.h"
 #include "chrome/browser/previews/previews_infobar_tab_helper.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_pingback_client.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_service.h"
+#include "components/data_reduction_proxy/core/common/data_reduction_proxy_params.h"
 #include "components/infobars/core/infobar.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace {
 
 // Key of the UMA Previews.InfoBarAction.LoFi histogram.
 const char kUMAPreviewsInfoBarActionLoFi[] = "Previews.InfoBarAction.LoFi";
 
@@ skipping 109 matching lines @@
 int PreviewsInfoBarDelegate::GetButtons() const {
   return BUTTON_NONE;
 }
 
 base::string16 PreviewsInfoBarDelegate::GetLinkText() const {
   return l10n_util::GetStringUTF16(IDS_PREVIEWS_INFOBAR_LINK);
 }
 
 bool PreviewsInfoBarDelegate::LinkClicked(WindowOpenDisposition disposition) {
   infobar_dismissed_action_ = INFOBAR_LOAD_ORIGINAL_CLICKED;
   if (!on_dismiss_callback_.is_null())

[megjablon, 2017/05/09 19:58:33]

Do Lo-Fi and Lite pages already have on_dismiss_callback set?

[RyanSturm, 2017/05/09 22:35:18]

Yes. That landed yesterday.

     on_dismiss_callback_.Run(true);
   on_dismiss_callback_.Reset();
 
   content::WebContents* web_contents =
       InfoBarService::WebContentsFromInfoBar(infobar());
   if (infobar_type_ == LITE_PAGE || infobar_type_ == LOFI) {
     auto* data_reduction_proxy_settings =
         DataReductionProxyChromeSettingsFactory::GetForBrowserContext(
             web_contents->GetBrowserContext());
-    data_reduction_proxy_settings->IncrementLoFiUserRequestsForImages();
+    if (!data_reduction_proxy::params::IsBlackListEnabledForServerPreviews())
+      data_reduction_proxy_settings->IncrementLoFiUserRequestsForImages();
     PreviewsInfoBarTabHelper* infobar_tab_helper =
         PreviewsInfoBarTabHelper::FromWebContents(web_contents);
     if (infobar_tab_helper &&
         infobar_tab_helper->committed_data_saver_navigation_id()) {
       data_reduction_proxy_settings->data_reduction_proxy_service()
           ->pingback_client()
           ->AddOptOut(
               infobar_tab_helper->committed_data_saver_navigation_id().value());
     }
 
     if (infobar_type_ == LITE_PAGE)
       web_contents->GetController().Reload(
           content::ReloadType::DISABLE_LOFI_MODE, true);
     else if (infobar_type_ == LOFI)
       web_contents->ReloadLoFiImages();
   } else if (infobar_type_ == OFFLINE) {
     // Prevent LoFi and lite page modes from showing after reload.
     // TODO(ryansturm): rename DISABLE_LOFI_MODE to DISABLE_PREVIEWS.
     //  crbug.com/707272
     web_contents->GetController().Reload(content::ReloadType::DISABLE_LOFI_MODE,
                                          true);
   }
 
   return true;
 }