Make the download request limiter listen to content settings changes.

chrome/browser/download/download_request_limiter_unittest.cc

 // Copyright (c) 2012 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/download/download_request_limiter.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/run_loop.h"
 #include "build/build_config.h"
+#include "chrome/browser/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_details.h"
+#include "content/public/browser/notification_service.h"
+#include "content/public/browser/notification_source.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/frame_navigate_params.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_ANDROID)
 #include "chrome/browser/download/download_request_infobar_delegate_android.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #else
 #include "chrome/browser/download/download_permission_request.h"
 #include "chrome/browser/ui/website_settings/mock_permission_bubble_factory.h"
@@ skipping 161 matching lines @@
       int expect_cancels,
       int expect_asks,
       int line) {
     EXPECT_EQ(expect_continues, continue_count_) << "line " << line;
     EXPECT_EQ(expect_cancels, cancel_count_) << "line " << line;
     EXPECT_EQ(expect_asks, AskAllowCount()) << "line " << line;
     continue_count_ = cancel_count_ = 0;
     testing_delegate_.ResetCounts();
   }
 
+  void UpdateContentSettings(WebContents* web_contents,
+                             ContentSetting setting) {
+    // Ensure a download state exists.
+    download_request_limiter_->GetDownloadState(web_contents, NULL, true);

[asanka, 2016/02/08 15:02:14]

NULL -> nullptr

[dominickn, 2016/02/11 01:25:53]

Done. Also updated other uses in this file.

+    SetHostContentSetting(web_contents, setting);
+
+    content::NotificationService::current()->Notify(
+        chrome::NOTIFICATION_WEB_CONTENT_SETTINGS_CHANGED,
+        content::Source<WebContents>(web_contents),
+        content::NotificationService::NoDetails());
+  }
+
  protected:
   void ContinueDownload(bool allow) {
     if (allow) {
       continue_count_++;
     } else {
       cancel_count_++;
     }
   }
 
   void SetHostContentSetting(WebContents* contents, ContentSetting setting) {
@@ skipping 270 matching lines @@
   CanDownload();
   ExpectAndResetCounts(0, 1, 0, __LINE__);
   ASSERT_EQ(DownloadRequestLimiter::PROMPT_BEFORE_DOWNLOAD,
             download_request_limiter_->GetDownloadStatus(web_contents()));
 
   CanDownload();
   ExpectAndResetCounts(0, 1, 0, __LINE__);
   ASSERT_EQ(DownloadRequestLimiter::PROMPT_BEFORE_DOWNLOAD,
             download_request_limiter_->GetDownloadStatus(web_contents()));
 }
+
+TEST_F(DownloadRequestLimiterTest,
+       DownloadRequestLimiter_ContentSettingChanged) {

[asanka, 2016/02/08 15:02:14]

The current behavior doesn't reset the download count when the content settings
change. I'm guessing this is intentional since it wouldn't allow an additional
"free" download once the content settings change to ASK.

Assuming this is intentional, would you mind adding a test that verifies the
behavior for the next download following a content settings change?

[dominickn, 2016/02/11 01:25:53]

Not sure I understood this 100%, but I added a bunch more explicit counts
checks.

+  NavigateAndCommit(GURL("http://foo.com/bar"));
+  ASSERT_EQ(DownloadRequestLimiter::ALLOW_ONE_DOWNLOAD,
+            download_request_limiter_->GetDownloadStatus(web_contents()));
+
+  // Set the content setting to allow and send the notification. Ensure that the
+  // limiter states update to match.
+  UpdateContentSettings(web_contents(), CONTENT_SETTING_ALLOW);
+  ASSERT_EQ(DownloadRequestLimiter::ALLOW_ALL_DOWNLOADS,
+            download_request_limiter_->GetDownloadStatus(web_contents()));
+
+  // Ask to download and assert we are still in allow.
+  CanDownload();
+  ASSERT_EQ(DownloadRequestLimiter::ALLOW_ALL_DOWNLOADS,
+            download_request_limiter_->GetDownloadStatus(web_contents()));
+
+  // Set the content setting to block and send the notification. Ensure that the
+  // limiter states updates to match.
+  UpdateContentSettings(web_contents(), CONTENT_SETTING_BLOCK);
+  ASSERT_EQ(DownloadRequestLimiter::DOWNLOADS_NOT_ALLOWED,
+            download_request_limiter_->GetDownloadStatus(web_contents()));
+
+  // Check that block to allow works as expected.
+  UpdateContentSettings(web_contents(), CONTENT_SETTING_ALLOW);
+  ASSERT_EQ(DownloadRequestLimiter::ALLOW_ALL_DOWNLOADS,
+            download_request_limiter_->GetDownloadStatus(web_contents()));
+
+  // Reset to ask.
+  UpdateContentSettings(web_contents(), CONTENT_SETTING_ASK);
+  ASSERT_EQ(DownloadRequestLimiter::PROMPT_BEFORE_DOWNLOAD,
+            download_request_limiter_->GetDownloadStatus(web_contents()));
+}