Move SendAutofillTypePredictions() into AutofillDriver.

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"
 #include "components/autofill/content/browser/autofill_driver_impl.h"
 #include "components/autofill/core/browser/autofill_common_test.h"
 #include "components/autofill/core/browser/autofill_external_delegate.h"
 #include "components/autofill/core/browser/autofill_manager.h"
 #include "components/autofill/core/browser/test_autofill_manager_delegate.h"
 #include "components/autofill/core/common/autofill_messages.h"
+#include "components/autofill/core/common/autofill_switches.h"
+#include "components/autofill/core/common/form_data_predictions.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/frame_navigate_params.h"
 #include "content/public/test/mock_render_process_host.h"
 #include "ipc/ipc_test_sink.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace autofill {
 
@@ skipping 67 matching lines @@
     AutofillMsg_FormDataFilled::Read(message, &autofill_param);
     if (page_id)
       *page_id = autofill_param.a;
     if (results)
       *results = autofill_param.b;
 
     process()->sink().ClearMessages();
     return true;
   }
 
+  // Searches for an |AutofillMsg_FieldTypePredictionsAvailable| message in the
+  // queue of sent IPC messages. If none is present, returns false. Otherwise,
+  // extracts the first |AutofillMsg_FieldTypePredictionsAvailable| message,
+  // fills the output parameter with the values of the message's parameter, and
+  // clears the queue of sent messages.
+  bool GetFieldTypePredictionsAvailable(
+      std::vector<FormDataPredictions>* predictions) {
+    const uint32 kMsgID = AutofillMsg_FieldTypePredictionsAvailable::ID;
+    const IPC::Message* message =
+        process()->sink().GetFirstMessageMatching(kMsgID);
+    if (!message)
+      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;
+  }
+
+
   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();
   details.is_main_frame = true;
   details.is_in_page = false;
   ASSERT_TRUE(details.is_navigation_to_different_page());
@@ skipping 17 matching lines @@
   driver_->SendFormDataToRenderer(input_page_id, input_form_data);
 
   int output_page_id = 0;
   FormData output_form_data;
   EXPECT_TRUE(GetAutofillFormDataFilledMessage(&output_page_id,
                                                &output_form_data));
   EXPECT_EQ(input_page_id, output_page_id);
   EXPECT_EQ(input_form_data, output_form_data);
 }
 
+TEST_F(AutofillDriverImplTest, TypePredictionsNotSentToRendererWhenDisabled) {
+  FormData form;
+  test::CreateTestAddressFormData(&form);
+  FormStructure* form_structure = new FormStructure(form, std::string());

[Ilya Sherman, 2013/07/02 18:43:01]

nit: If you need to heap-allocate this, please protect this allocation with a
scoped_ptr, and subsequently pass ownership of the memory as appropriate.  In
fact, though, it looks like you could just stack-allocate this object.

[blundell, 2013/07/02 20:15:33]

Oops, I was totally going to clean this up before sending out the CL ;). Thanks,
done.

On 2013/07/02 18:43:01, Ilya Sherman wrote:

+  std::vector<FormStructure*> forms(1, form_structure);
+  std::vector<FormDataPredictions> expected_type_predictions;
+  FormStructure::GetFieldTypePredictions(forms, &expected_type_predictions);
+  driver_->SendAutofillTypePredictionsToRenderer(forms);
+  EXPECT_FALSE(GetFieldTypePredictionsAvailable(NULL));
+}
+
+TEST_F(AutofillDriverImplTest, TypePredictionsSentToRendererWhenEnabled) {
+  CommandLine::ForCurrentProcess()->AppendSwitch(
+      switches::kShowAutofillTypePredictions);
+
+  FormData form;
+  test::CreateTestAddressFormData(&form);
+  FormStructure* form_structure = new FormStructure(form, std::string());
+  std::vector<FormStructure*> forms(1, form_structure);
+  std::vector<FormDataPredictions> expected_type_predictions;
+  FormStructure::GetFieldTypePredictions(forms, &expected_type_predictions);
+  driver_->SendAutofillTypePredictionsToRenderer(forms);
+
+  std::vector<FormDataPredictions> output_type_predictions;
+  EXPECT_TRUE(GetFieldTypePredictionsAvailable(&output_type_predictions));
+  EXPECT_EQ(expected_type_predictions, output_type_predictions);
+}
+
 }  // namespace autofill