Add user-gesture-related tests for ContentAutofillDriver

components/autofill/content/browser/content_autofill_driver_unittest.cc

Index: components/autofill/content/browser/content_autofill_driver_unittest.cc
diff --git a/components/autofill/content/browser/content_autofill_driver_unittest.cc b/components/autofill/content/browser/content_autofill_driver_unittest.cc
index 82dd2f6254a902f05767ce706bf9f83f43a0f7a7..da432f283b7d519f267456539faa52e869b86350 100644
--- a/components/autofill/content/browser/content_autofill_driver_unittest.cc
+++ b/components/autofill/content/browser/content_autofill_driver_unittest.cc
@@ -137,6 +137,9 @@ class FakeAutofillAgent : public mojom::AutofillAgent {
     return true;
   }
 
+  // Mocked mojom::AutofillAgent methods:
+  MOCK_METHOD0(FirstUserGestureObservedInTab, void());
+
  private:
   void CallDone() {
     if (!quit_closure_.is_null()) {
@@ -145,9 +148,7 @@ class FakeAutofillAgent : public mojom::AutofillAgent {
     }
   }
 
-  // mojom::AutofillAgent methods:
-  void FirstUserGestureObservedInTab() override {}
-
+  // mojom::AutofillAgent:
   void FillForm(int32_t id, const FormData& form) override {
     fill_form_id_ = id;
     fill_form_form_ = form;
@@ -236,6 +237,11 @@ class MockAutofillManager : public AutofillManager {
   MOCK_METHOD0(Reset, void());
 };
 
+class MockAutofillClient : public TestAutofillClient {
+ public:
+  MOCK_METHOD0(OnFirstUserGestureObserved, void());
+};
+
 class TestContentAutofillDriver : public ContentAutofillDriver {
  public:
   TestContentAutofillDriver(content::RenderFrameHost* rfh,
@@ -259,7 +265,7 @@ class ContentAutofillDriverTest : public content::RenderViewHostTestHarness {
   void SetUp() override {
     content::RenderViewHostTestHarness::SetUp();
 
-    test_autofill_client_.reset(new TestAutofillClient());
+    test_autofill_client_.reset(new MockAutofillClient());
     driver_.reset(new TestContentAutofillDriver(web_contents()->GetMainFrame(),
                                                 test_autofill_client_.get()));
 
@@ -279,7 +285,7 @@ class ContentAutofillDriverTest : public content::RenderViewHostTestHarness {
   }
 
  protected:
-  std::unique_ptr<TestAutofillClient> test_autofill_client_;
+  std::unique_ptr<MockAutofillClient> test_autofill_client_;
   std::unique_ptr<TestContentAutofillDriver> driver_;
 
   FakeAutofillAgent fake_agent_;
@@ -479,4 +485,18 @@ TEST_F(ContentAutofillDriverTest, CreditCardFormInteractionOnHTTPS) {
                   content::SSLStatus::DISPLAYED_CREDIT_CARD_FIELD_ON_HTTP));
 }
 
+TEST_F(ContentAutofillDriverTest, NotifyFirstUserGestureObservedInTab) {
+  base::RunLoop run_loop;
+  fake_agent_.SetQuitLoopClosure(run_loop.QuitClosure());

[vabr (Chromium), 2016/12/23 12:54:18]

I just realised that this makes no sense when FirstUserGestureObservedInTab is
just a mocked method, not calling CallDone() in the fake agent.
I don't think QuitClosure is needed here to make RunUntilIdle() return, because
there are no repeated tasks such as animated web pages run.

To be honest, I believe this is also not needed for the rest of the tests, but I
won't touch that in this CL. Perhaps in a follow-up.

+
+  driver_->NotifyFirstUserGestureObservedInTab();
+  EXPECT_CALL(fake_agent_, FirstUserGestureObservedInTab());
+  run_loop.RunUntilIdle();
+}
+
+TEST_F(ContentAutofillDriverTest, FirstUserGestureObserved) {
+  EXPECT_CALL(*test_autofill_client_, OnFirstUserGestureObserved());
+  driver_->FirstUserGestureObserved();
+}
+
 }  // namespace autofill