Replace DidGetUserGesture with DidGetUserInteraction in the download request limiter.

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"
@@ skipping 157 matching lines @@
 
   void CanDownloadFor(WebContents* web_contents) {
     download_request_limiter_->CanDownloadImpl(
         web_contents,
         "GET",  // request method
         base::Bind(&DownloadRequestLimiterTest::ContinueDownload,
                    base::Unretained(this)));
     base::RunLoop().RunUntilIdle();
   }
 
-  void OnUserGesture() {
-    OnUserGestureFor(web_contents());
+  void OnUserInteraction(blink::WebInputEvent::Type type) {
+    OnUserInteractionFor(web_contents(), type);
   }
 
-  void OnUserGestureFor(WebContents* web_contents) {
+  void OnUserInteractionFor(WebContents* web_contents,
+                            blink::WebInputEvent::Type type) {
     DownloadRequestLimiter::TabDownloadState* state =
         download_request_limiter_->GetDownloadState(web_contents, nullptr,
                                                     false);
     if (state)
-      state->DidGetUserGesture();
+      state->DidGetUserInteraction(type);
   }
 
   void ExpectAndResetCounts(
       int expect_continues,
       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;
@@ skipping 108 matching lines @@
   // all state.
   NavigateAndCommit(GURL("http://foo.com/bar2"));
   LoadCompleted();
   CanDownload();
   ExpectAndResetCounts(1, 0, 0, __LINE__);
   ASSERT_EQ(DownloadRequestLimiter::ALLOW_ALL_DOWNLOADS,
             download_request_limiter_->GetDownloadStatus(web_contents()));
 
   // Do a user gesture, because we're at allow all, this shouldn't change the
   // state.
-  OnUserGesture();
+  OnUserInteraction(blink::WebInputEvent::RawKeyDown);
   ASSERT_EQ(DownloadRequestLimiter::ALLOW_ALL_DOWNLOADS,
             download_request_limiter_->GetDownloadStatus(web_contents()));
 
   // Navigate to a completely different host, which should reset the state.
   NavigateAndCommit(GURL("http://fooey.com"));
   LoadCompleted();
   ASSERT_EQ(DownloadRequestLimiter::ALLOW_ONE_DOWNLOAD,
             download_request_limiter_->GetDownloadStatus(web_contents()));
 
   // Do two downloads, allowing the second so that we end up with allow all.
@@ skipping 21 matching lines @@
 TEST_F(DownloadRequestLimiterTest, DownloadRequestLimiter_ResetOnUserGesture) {
   NavigateAndCommit(GURL("http://foo.com/bar"));
   LoadCompleted();
 
   // Do one download, which should change to prompt before download.
   CanDownload();
   ExpectAndResetCounts(1, 0, 0, __LINE__);
   ASSERT_EQ(DownloadRequestLimiter::PROMPT_BEFORE_DOWNLOAD,
             download_request_limiter_->GetDownloadStatus(web_contents()));
 
-  // Do a user gesture, which should reset back to allow one.
-  OnUserGesture();
+  // Do a user gesture with mouse scroll, which should be ignored.
+  OnUserInteraction(blink::WebInputEvent::MouseWheel);
+  ASSERT_EQ(DownloadRequestLimiter::PROMPT_BEFORE_DOWNLOAD,
+            download_request_limiter_->GetDownloadStatus(web_contents()));
+  // Do a user gesture with mouse click, which should reset back to allow one.
+  OnUserInteraction(blink::WebInputEvent::MouseDown);
   ASSERT_EQ(DownloadRequestLimiter::ALLOW_ONE_DOWNLOAD,
             download_request_limiter_->GetDownloadStatus(web_contents()));
 
+  // Do one download, which should change to prompt before download.
+  CanDownload();
+  ExpectAndResetCounts(1, 0, 0, __LINE__);
+  ASSERT_EQ(DownloadRequestLimiter::PROMPT_BEFORE_DOWNLOAD,
+            download_request_limiter_->GetDownloadStatus(web_contents()));
+
+  // Do a user gesture with gesture tap, which should reset back to allow one.
+  OnUserInteraction(blink::WebInputEvent::GestureTapDown);
+  ASSERT_EQ(DownloadRequestLimiter::ALLOW_ONE_DOWNLOAD,
+            download_request_limiter_->GetDownloadStatus(web_contents()));
+
+  // Do one download, which should change to prompt before download.
+  CanDownload();
+  ExpectAndResetCounts(1, 0, 0, __LINE__);
+  ASSERT_EQ(DownloadRequestLimiter::PROMPT_BEFORE_DOWNLOAD,
+            download_request_limiter_->GetDownloadStatus(web_contents()));
+
+  // Do a user gesture with keyboard down, which should reset back to allow one.
+  OnUserInteraction(blink::WebInputEvent::RawKeyDown);
+  ASSERT_EQ(DownloadRequestLimiter::ALLOW_ONE_DOWNLOAD,
+            download_request_limiter_->GetDownloadStatus(web_contents()));
+
   // Ask twice, which triggers calling the delegate. Don't allow the download
   // so that we end up with not allowed.
   CanDownload();
   ExpectAndResetCounts(1, 0, 0, __LINE__);
   ASSERT_EQ(DownloadRequestLimiter::PROMPT_BEFORE_DOWNLOAD,
             download_request_limiter_->GetDownloadStatus(web_contents()));
 
   UpdateExpectations(CANCEL);
   CanDownload();
   ASSERT_EQ(DownloadRequestLimiter::DOWNLOADS_NOT_ALLOWED,
             download_request_limiter_->GetDownloadStatus(web_contents()));
   ExpectAndResetCounts(0, 1, 1, __LINE__);
 
   // A user gesture now should NOT change the state.
-  OnUserGesture();
+  OnUserInteraction(blink::WebInputEvent::MouseDown);
   ASSERT_EQ(DownloadRequestLimiter::DOWNLOADS_NOT_ALLOWED,
             download_request_limiter_->GetDownloadStatus(web_contents()));
   // And make sure we really can't download.
   CanDownload();
   ExpectAndResetCounts(0, 1, 0, __LINE__);
   // And the state shouldn't have changed.
   ASSERT_EQ(DownloadRequestLimiter::DOWNLOADS_NOT_ALLOWED,
             download_request_limiter_->GetDownloadStatus(web_contents()));
 }
 
@@ skipping 59 matching lines @@
   // prompting when it doesn't have a InfoBarService, so unset the delegate.
   testing_delegate_.UnsetInfobarDelegate();
   ExpectAndResetCounts(0, 0, 0, __LINE__);
   EXPECT_EQ(DownloadRequestLimiter::ALLOW_ONE_DOWNLOAD,
             download_request_limiter_->GetDownloadStatus(web_contents.get()));
   // You get one freebie.
   CanDownloadFor(web_contents.get());
   ExpectAndResetCounts(1, 0, 0, __LINE__);
   EXPECT_EQ(DownloadRequestLimiter::PROMPT_BEFORE_DOWNLOAD,
             download_request_limiter_->GetDownloadStatus(web_contents.get()));
-  OnUserGestureFor(web_contents.get());
+  OnUserInteractionFor(web_contents.get(),
+                       blink::WebInputEvent::GestureTapDown);
   EXPECT_EQ(DownloadRequestLimiter::ALLOW_ONE_DOWNLOAD,
             download_request_limiter_->GetDownloadStatus(web_contents.get()));
   CanDownloadFor(web_contents.get());
   ExpectAndResetCounts(1, 0, 0, __LINE__);
   EXPECT_EQ(DownloadRequestLimiter::PROMPT_BEFORE_DOWNLOAD,
             download_request_limiter_->GetDownloadStatus(web_contents.get()));
   CanDownloadFor(web_contents.get());
   ExpectAndResetCounts(0, 1, 0, __LINE__);
   EXPECT_EQ(DownloadRequestLimiter::DOWNLOADS_NOT_ALLOWED,
             download_request_limiter_->GetDownloadStatus(web_contents.get()));
-  OnUserGestureFor(web_contents.get());
+  OnUserInteractionFor(web_contents.get(), blink::WebInputEvent::RawKeyDown);
   EXPECT_EQ(DownloadRequestLimiter::ALLOW_ONE_DOWNLOAD,
             download_request_limiter_->GetDownloadStatus(web_contents.get()));
   CanDownloadFor(web_contents.get());
   ExpectAndResetCounts(1, 0, 0, __LINE__);
   EXPECT_EQ(DownloadRequestLimiter::PROMPT_BEFORE_DOWNLOAD,
             download_request_limiter_->GetDownloadStatus(web_contents.get()));
 }
 #endif
 
 TEST_F(DownloadRequestLimiterTest,
@@ skipping 73 matching lines @@
   // changing the content setting).
   UpdateContentSettings(web_contents(), CONTENT_SETTING_ASK);
   ASSERT_EQ(DownloadRequestLimiter::PROMPT_BEFORE_DOWNLOAD,
             download_request_limiter_->GetDownloadStatus(web_contents()));
   UpdateExpectations(WAIT);
   CanDownload();
   ExpectAndResetCounts(0, 0, 1, __LINE__);
   ASSERT_EQ(DownloadRequestLimiter::PROMPT_BEFORE_DOWNLOAD,
             download_request_limiter_->GetDownloadStatus(web_contents()));
 }