Move AutofillMsg_ClearPreviewedForm IPC send to AutofillDriverImpl

components/autofill/content/browser/autofill_driver_impl_unittest.cc

 // Copyright 2013 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 <algorithm>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
@@ skipping 106 matching lines @@
       return false;
     Tuple1<std::vector<FormDataPredictions> > autofill_param;
     AutofillMsg_FieldTypePredictionsAvailable::Read(message, &autofill_param);
     if (predictions)
       *predictions = autofill_param.a;
 
     process()->sink().ClearMessages();
     return true;
   }
 
-  // Searches for an |AutofillMsg_SetAutofillActionPreview| message in the
-  // queue of sent IPC messages. If none is present, returns false. Otherwise,
-  // clears the queue of sent messages and returns true.
-  bool GetSetAutofillActionPreviewMessage() {
-    const uint32 kMsgID = AutofillMsg_SetAutofillActionPreview::ID;
+  // Searches for a message matching |messageID| in the queue of sent IPC
+  // messages. If none is present, returns false. Otherwise, clears the queue
+  // of sent messages and returns true.
+  bool GetMessageMatchingID(const uint32 messageID) {

[Ilya Sherman, 2013/07/09 22:45:36]

nit: Perhaps name this "HasMessageMatchingID" rather than "Get", since only the
boolean return value actually gets used?

[Ilya Sherman, 2013/07/09 22:45:36]

nit: For whatever reason, the common style is to not mark parameters as const
unless they're pointers or references.

[blundell, 2013/07/10 08:35:20]

Done.

[blundell, 2013/07/10 08:35:20]

Done.

     const IPC::Message* message =
-        process()->sink().GetFirstMessageMatching(kMsgID);
+        process()->sink().GetFirstMessageMatching(messageID);
     if (!message)
       return false;
     process()->sink().ClearMessages();
-    return true;
-  }
-
-  // Searches for an |AutofillMsg_SetAutofillActionFill| message in the
-  // queue of sent IPC messages. If none is present, returns false. Otherwise,
-  // clears the queue of sent messages and returns true.
-  bool GetSetAutofillActionFillMessage() {
-    const uint32 kMsgID = AutofillMsg_SetAutofillActionFill::ID;
-    const IPC::Message* message =
-        process()->sink().GetFirstMessageMatching(kMsgID);
-    if (!message)
-      return false;
-    process()->sink().ClearMessages();
-    return true;
-  }
-
-  // Searches for an |AutofillMsg_ClearForm| message in the queue of sent IPC
-  // messages. If none is present, returns false. Otherwise, clears the queue
-  // of sent messages and returns true.
-  bool GetClearFormMessage() {
-    const uint32 kMsgID = AutofillMsg_ClearForm::ID;
-    const IPC::Message* message =
-        process()->sink().GetFirstMessageMatching(kMsgID);
-    if (!message)
-      return false;
-    process()->sink().ClearMessages();
     return true;
   }
 
   scoped_ptr<TestAutofillManagerDelegate> test_manager_delegate_;
   scoped_ptr<TestAutofillDriverImpl> driver_;
 };
 
 TEST_F(AutofillDriverImplTest, NavigatedToDifferentPage) {
   EXPECT_CALL(*driver_->mock_autofill_manager(), Reset());
   content::LoadCommittedDetails details = content::LoadCommittedDetails();
@@ skipping 49 matching lines @@
   driver_->SendAutofillTypePredictionsToRenderer(forms);
 
   std::vector<FormDataPredictions> output_type_predictions;
   EXPECT_TRUE(GetFieldTypePredictionsAvailable(&output_type_predictions));
   EXPECT_EQ(expected_type_predictions, output_type_predictions);
 }
 
 TEST_F(AutofillDriverImplTest, PreviewActionSentToRenderer) {
   driver_->SetRendererActionOnFormDataReception(
       AutofillDriver::FORM_DATA_ACTION_PREVIEW);
-  EXPECT_TRUE(GetSetAutofillActionPreviewMessage());
+  EXPECT_TRUE(GetMessageMatchingID(AutofillMsg_SetAutofillActionPreview::ID));
 }
 
 TEST_F(AutofillDriverImplTest, FillActionSentToRenderer) {
   driver_->SetRendererActionOnFormDataReception(
       AutofillDriver::FORM_DATA_ACTION_FILL);
-  EXPECT_TRUE(GetSetAutofillActionFillMessage());
+  EXPECT_TRUE(GetMessageMatchingID(AutofillMsg_SetAutofillActionFill::ID));
 }
 
-TEST_F(AutofillDriverImplTest, ClearFormSentToRenderer) {
-  driver_->RendererShouldClearForm();
-  EXPECT_TRUE(GetClearFormMessage());
+TEST_F(AutofillDriverImplTest, ClearFilledFormSentToRenderer) {
+  driver_->RendererShouldClearFilledForm();
+  EXPECT_TRUE(GetMessageMatchingID(AutofillMsg_ClearForm::ID));
+}
+
+TEST_F(AutofillDriverImplTest, ClearPreviewedFormSentToRenderer) {
+  driver_->RendererShouldClearPreviewedForm();
+  EXPECT_TRUE(GetMessageMatchingID(AutofillMsg_ClearPreviewedForm::ID));
 }
 
 }  // namespace autofill