Android - Introduce "keyboard accessory" for Autofill suggestions.

components/autofill/core/browser/autofill_external_delegate_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 <vector>
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string16.h"
@@ skipping 139 matching lines @@
   scoped_ptr<AutofillExternalDelegate> external_delegate_;
 
   base::MessageLoop message_loop_;
 };
 
 // Test that our external delegate called the virtual methods at the right time.
 TEST_F(AutofillExternalDelegateUnitTest, TestExternalDelegateVirtualCalls) {
   IssueOnQuery(kQueryId);
 
   // The enums must be cast to ints to prevent compile errors on linux_rel.
+  auto element_ids = testing::ElementsAre(
+      kAutofillProfileId,
+#if !defined(OS_ANDROID)
+      static_cast<int>(POPUP_ITEM_ID_SEPARATOR),
+#endif
+      static_cast<int>(POPUP_ITEM_ID_AUTOFILL_OPTIONS));
   EXPECT_CALL(
       autofill_client_,
-      ShowAutofillPopup(_,
-                        _,
-                        SuggestionVectorIdsAre(testing::ElementsAre(
-                            kAutofillProfileId,
-                            static_cast<int>(POPUP_ITEM_ID_SEPARATOR),
-                            static_cast<int>(POPUP_ITEM_ID_AUTOFILL_OPTIONS))),
-                        _));
+      ShowAutofillPopup(_, _, SuggestionVectorIdsAre(element_ids), _));
 
   // This should call ShowAutofillPopup.
   std::vector<Suggestion> autofill_item;
   autofill_item.push_back(Suggestion());
   autofill_item[0].frontend_id = kAutofillProfileId;
   external_delegate_->OnSuggestionsReturned(kQueryId, autofill_item);
 
   EXPECT_CALL(*autofill_manager_,
               FillOrPreviewForm(
                   AutofillDriver::FORM_DATA_ACTION_FILL, _, _, _, _));
@@ skipping 13 matching lines @@
   data_list_items.push_back(base::string16());
 
   EXPECT_CALL(
       autofill_client_,
       UpdateAutofillPopupDataListValues(data_list_items, data_list_items));
 
   external_delegate_->SetCurrentDataListValues(data_list_items,
                                                data_list_items);
 
   // The enums must be cast to ints to prevent compile errors on linux_rel.
+  auto element_ids = testing::ElementsAre(
+      static_cast<int>(POPUP_ITEM_ID_DATALIST_ENTRY),
+#if !defined(OS_ANDROID)
+      static_cast<int>(POPUP_ITEM_ID_SEPARATOR),
+#endif
+      kAutofillProfileId,
+#if !defined(OS_ANDROID)
+      static_cast<int>(POPUP_ITEM_ID_SEPARATOR),
+#endif
+      static_cast<int>(POPUP_ITEM_ID_AUTOFILL_OPTIONS));
   EXPECT_CALL(
       autofill_client_,
-      ShowAutofillPopup(_,
-                        _,
-                        SuggestionVectorIdsAre(testing::ElementsAre(
-                            static_cast<int>(POPUP_ITEM_ID_DATALIST_ENTRY),
-                            static_cast<int>(POPUP_ITEM_ID_SEPARATOR),
-                            kAutofillProfileId,
-                            static_cast<int>(POPUP_ITEM_ID_SEPARATOR),
-                            static_cast<int>(POPUP_ITEM_ID_AUTOFILL_OPTIONS))),
-                        _));
+      ShowAutofillPopup(_, _, SuggestionVectorIdsAre(element_ids), _));
 
   // This should call ShowAutofillPopup.
   std::vector<Suggestion> autofill_item;
   autofill_item.push_back(Suggestion());
   autofill_item[0].frontend_id = kAutofillProfileId;
   external_delegate_->OnSuggestionsReturned(kQueryId, autofill_item);
 
   // Try calling OnSuggestionsReturned with no Autofill values and ensure
   // the datalist items are still shown.
   // The enum must be cast to an int to prevent compile errors on linux_rel.
@@ skipping 23 matching lines @@
   data_list_items.push_back(base::string16());
 
   EXPECT_CALL(
       autofill_client_,
       UpdateAutofillPopupDataListValues(data_list_items, data_list_items));
 
   external_delegate_->SetCurrentDataListValues(data_list_items,
                                                data_list_items);
 
   // The enums must be cast to ints to prevent compile errors on linux_rel.
+  auto element_ids = testing::ElementsAre(
+      static_cast<int>(POPUP_ITEM_ID_DATALIST_ENTRY),
+#if !defined(OS_ANDROID)
+      static_cast<int>(POPUP_ITEM_ID_SEPARATOR),
+#endif
+      kAutofillProfileId,
+#if !defined(OS_ANDROID)
+      static_cast<int>(POPUP_ITEM_ID_SEPARATOR),
+#endif
+      static_cast<int>(POPUP_ITEM_ID_AUTOFILL_OPTIONS));
   EXPECT_CALL(
       autofill_client_,
-      ShowAutofillPopup(_,
-                        _,
-                        SuggestionVectorIdsAre(testing::ElementsAre(
-                            static_cast<int>(POPUP_ITEM_ID_DATALIST_ENTRY),
-                            static_cast<int>(POPUP_ITEM_ID_SEPARATOR),
-                            kAutofillProfileId,
-                            static_cast<int>(POPUP_ITEM_ID_SEPARATOR),
-                            static_cast<int>(POPUP_ITEM_ID_AUTOFILL_OPTIONS))),
-                        _));
+      ShowAutofillPopup(_, _, SuggestionVectorIdsAre(element_ids), _));
 
   // Ensure the popup is displayed.
   std::vector<Suggestion> autofill_item;
   autofill_item.push_back(Suggestion());
   autofill_item[0].frontend_id = kAutofillProfileId;
   external_delegate_->OnSuggestionsReturned(kQueryId, autofill_item);
 
   // This would normally get called from ShowAutofillPopup, but it is mocked so
   // we need to call OnPopupShown ourselves.
   external_delegate_->OnPopupShown();
@@ skipping 206 matching lines @@
 TEST_F(AutofillExternalDelegateUnitTest, ExternalDelegateFillFieldWithValue) {
   EXPECT_CALL(autofill_client_, HideAutofillPopup());
   base::string16 dummy_string(ASCIIToUTF16("baz foo"));
   EXPECT_CALL(*autofill_driver_,
               RendererShouldFillFieldWithValue(dummy_string));
   external_delegate_->DidAcceptSuggestion(dummy_string,
                                           POPUP_ITEM_ID_AUTOCOMPLETE_ENTRY);
 }
 
 }  // namespace autofill