Adding offline navigations to the previews blacklist

chrome/browser/previews/previews_infobar_delegate_unittest.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 <memory>
 
+#include "base/bind.h"
+#include "base/bind_helpers.h"
+#include "base/optional.h"
 #include "base/test/histogram_tester.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 "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_test_utils.h"
 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_pref_names.h"
@@ skipping 55 matching lines @@
         base::ThreadTaskRunnerHandle::Get());
   }
 
   void TearDown() override {
     drp_test_context_->DestroySettings();
     ChromeRenderViewHostTestHarness::TearDown();
   }
 
   ConfirmInfoBarDelegate* CreateInfoBar(
       PreviewsInfoBarDelegate::PreviewsInfoBarType type) {
-    PreviewsInfoBarDelegate::Create(web_contents(), type);
+    PreviewsInfoBarDelegate::Create(
+        web_contents(), type,
+        base::Bind(&PreviewsInfoBarDelegateUnitTest::infobar_reload_by_user,
+                   base::Unretained(this)));
 
     InfoBarService* infobar_service =
         InfoBarService::FromWebContents(web_contents());
     EXPECT_EQ(1U, infobar_service->infobar_count());
 
     return infobar_service->infobar_at(0)
         ->delegate()
         ->AsConfirmInfoBarDelegate();
   }
 
+  void infobar_reload_by_user(bool infobar_reload_by_user) {

[megjablon, 2016/11/09 00:19:11]

Use camel case and if you rename OnDismissPreviewsInfobar

[RyanSturm, 2016/11/09 18:47:13]

Done.

+    infobar_reload_by_user_ = infobar_reload_by_user;
+  }
+
   InfoBarService* infobar_service() {
     return InfoBarService::FromWebContents(web_contents());
   }
 
   std::unique_ptr<data_reduction_proxy::DataReductionProxyTestContext>
       drp_test_context_;
+
+  base::Optional<bool> infobar_reload_by_user_;
 };
 
 TEST_F(PreviewsInfoBarDelegateUnitTest, InfobarTestNavigationDismissal) {
   base::HistogramTester tester;
 
   CreateInfoBar(PreviewsInfoBarDelegate::LOFI);
 
   // Try showing a second infobar. Another should not be shown since the page
   // has not navigated.
-  PreviewsInfoBarDelegate::Create(web_contents(),
-                                  PreviewsInfoBarDelegate::LOFI);
+  PreviewsInfoBarDelegate::Create(
+      web_contents(), PreviewsInfoBarDelegate::LOFI,
+      PreviewsInfoBarDelegate::PreviewsUserLeavePreviewCallback());
   EXPECT_EQ(1U, infobar_service()->infobar_count());
 
   // Navigate and make sure the infobar is dismissed.
   content::WebContentsTester::For(web_contents())
       ->NavigateAndCommit(GURL(kTestUrl));
   EXPECT_EQ(0U, infobar_service()->infobar_count());
+  EXPECT_FALSE(infobar_reload_by_user_.value());
 
   tester.ExpectBucketCount(
       kUMAPreviewsInfoBarActionLoFi,
       PreviewsInfoBarDelegate::INFOBAR_DISMISSED_BY_NAVIGATION, 1);
   EXPECT_EQ(0, drp_test_context_->pref_service()->GetInteger(
                    data_reduction_proxy::prefs::kLoFiLoadImagesPerSession));
 }
 
 TEST_F(PreviewsInfoBarDelegateUnitTest, InfobarTestUserDismissal) {
   base::HistogramTester tester;
 
   ConfirmInfoBarDelegate* infobar =
       CreateInfoBar(PreviewsInfoBarDelegate::LOFI);
 
   // Simulate dismissing the infobar.
   infobar->InfoBarDismissed();
   infobar_service()->infobar_at(0)->RemoveSelf();
   EXPECT_EQ(0U, infobar_service()->infobar_count());
 
   tester.ExpectBucketCount(kUMAPreviewsInfoBarActionLoFi,
                            PreviewsInfoBarDelegate::INFOBAR_DISMISSED_BY_USER,
                            1);
   EXPECT_EQ(0, drp_test_context_->pref_service()->GetInteger(
                    data_reduction_proxy::prefs::kLoFiLoadImagesPerSession));
+  EXPECT_FALSE(infobar_reload_by_user_.value());
 }
 
 TEST_F(PreviewsInfoBarDelegateUnitTest, InfobarTestClickLink) {
   base::HistogramTester tester;
 
   ConfirmInfoBarDelegate* infobar =
       CreateInfoBar(PreviewsInfoBarDelegate::LOFI);
 
   // Simulate clicking the infobar link.
   if (infobar->LinkClicked(WindowOpenDisposition::CURRENT_TAB))
     infobar_service()->infobar_at(0)->RemoveSelf();
   EXPECT_EQ(0U, infobar_service()->infobar_count());
 
   tester.ExpectBucketCount(
       kUMAPreviewsInfoBarActionLoFi,
       PreviewsInfoBarDelegate::INFOBAR_LOAD_ORIGINAL_CLICKED, 1);
   EXPECT_EQ(1, drp_test_context_->pref_service()->GetInteger(
                    data_reduction_proxy::prefs::kLoFiLoadImagesPerSession));
+  EXPECT_TRUE(infobar_reload_by_user_.value());
 }
 
 TEST_F(PreviewsInfoBarDelegateUnitTest, InfobarTestShownOncePerNavigation) {
   ConfirmInfoBarDelegate* infobar =
       CreateInfoBar(PreviewsInfoBarDelegate::LOFI);
 
   // Simulate dismissing the infobar.
   infobar->InfoBarDismissed();
   infobar_service()->infobar_at(0)->RemoveSelf();
   EXPECT_EQ(0U, infobar_service()->infobar_count());
 
-  PreviewsInfoBarDelegate::Create(web_contents(),
-                                  PreviewsInfoBarDelegate::LOFI);
+  PreviewsInfoBarDelegate::Create(
+      web_contents(), PreviewsInfoBarDelegate::LOFI,
+      PreviewsInfoBarDelegate::PreviewsUserLeavePreviewCallback());
 
   // Infobar should not be shown again since a navigation hasn't happened.
   EXPECT_EQ(0U, infobar_service()->infobar_count());
 
   // Navigate and show infobar again.
   content::WebContentsTester::For(web_contents())
       ->NavigateAndCommit(GURL(kTestUrl));
   CreateInfoBar(PreviewsInfoBarDelegate::LOFI);
 }
 
@@ skipping 60 matching lines @@
   ASSERT_EQ(l10n_util::GetStringUTF16(IDS_PREVIEWS_INFOBAR_FASTER_PAGE_TITLE),
             infobar->GetMessageText());
   ASSERT_EQ(l10n_util::GetStringUTF16(IDS_PREVIEWS_INFOBAR_LINK),
             infobar->GetLinkText());
 #if defined(OS_ANDROID)
   ASSERT_EQ(IDR_ANDROID_INFOBAR_PREVIEWS, infobar->GetIconId());
 #else
   ASSERT_EQ(PreviewsInfoBarDelegate::kNoIconID, infobar->GetIconId());
 #endif
 }