[Autofill/Autocomplete Feature] Substring matching instead of prefix matching.

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 29 matching lines @@
 
 class MockAutofillDriver : public TestAutofillDriver {
  public:
   MockAutofillDriver() {}
   // Mock methods to enable testability.
   MOCK_METHOD1(RendererShouldAcceptDataListSuggestion,
                void(const base::string16&));
   MOCK_METHOD0(RendererShouldClearFilledForm, void());
   MOCK_METHOD0(RendererShouldClearPreviewedForm, void());
   MOCK_METHOD1(RendererShouldFillFieldWithValue, void(const base::string16&));
-  MOCK_METHOD1(RendererShouldPreviewFieldWithValue,
-               void(const base::string16&));
+  MOCK_METHOD2(RendererShouldPreviewFieldWithValue,
+               void(const base::string16&, size_t));
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockAutofillDriver);
 };
 
 class MockAutofillClient : public autofill::TestAutofillClient {
  public:
   MockAutofillClient() {}
 
   MOCK_METHOD1(ScanCreditCard,
@@ skipping 250 matching lines @@
   std::vector<Suggestion> autofill_item;
   autofill_item.push_back(Suggestion());
   autofill_item[0].frontend_id = POPUP_ITEM_ID_WARNING_MESSAGE;
   external_delegate_->OnSuggestionsReturned(kQueryId, autofill_item);
 }
 
 // Test that the Autofill delegate doesn't try and fill a form with a
 // negative unique id.
 TEST_F(AutofillExternalDelegateUnitTest, ExternalDelegateInvalidUniqueId) {
   // Ensure it doesn't try to preview the negative id.
+  size_t match_start = 0;
   EXPECT_CALL(*autofill_manager_, FillOrPreviewForm(_, _, _, _, _)).Times(0);
   EXPECT_CALL(*autofill_driver_, RendererShouldClearPreviewedForm()).Times(1);
-  external_delegate_->DidSelectSuggestion(base::string16(), -1);
+  external_delegate_->DidSelectSuggestion(base::string16(), -1, match_start);
 
   // Ensure it doesn't try to fill the form in with the negative id.
   EXPECT_CALL(autofill_client_, HideAutofillPopup());
   EXPECT_CALL(*autofill_manager_, FillOrPreviewForm(_, _, _, _, _)).Times(0);
   external_delegate_->DidAcceptSuggestion(base::string16(), -1, 0);
 }
 
 // Test that the ClearPreview call is only sent if the form was being previewed
 // (i.e. it isn't autofilling a password).
 TEST_F(AutofillExternalDelegateUnitTest, ExternalDelegateClearPreviewedForm) {
   // Ensure selecting a new password entries or Autofill entries will
   // cause any previews to get cleared.
+  size_t match_start = 0;
   EXPECT_CALL(*autofill_driver_, RendererShouldClearPreviewedForm()).Times(1);
-  external_delegate_->DidSelectSuggestion(ASCIIToUTF16("baz foo"),
-                                          POPUP_ITEM_ID_PASSWORD_ENTRY);
+  external_delegate_->DidSelectSuggestion(
+      ASCIIToUTF16("baz foo"), POPUP_ITEM_ID_PASSWORD_ENTRY, match_start);
   EXPECT_CALL(*autofill_driver_, RendererShouldClearPreviewedForm()).Times(1);
   EXPECT_CALL(*autofill_manager_,
               FillOrPreviewForm(
                   AutofillDriver::FORM_DATA_ACTION_PREVIEW, _, _, _, _));
-  external_delegate_->DidSelectSuggestion(ASCIIToUTF16("baz foo"), 1);
+  external_delegate_->DidSelectSuggestion(ASCIIToUTF16("baz foo"), 1,
+                                          match_start);
 
   // Ensure selecting an autocomplete entry will cause any previews to
   // get cleared.
   EXPECT_CALL(*autofill_driver_, RendererShouldClearPreviewedForm()).Times(1);
   EXPECT_CALL(*autofill_driver_, RendererShouldPreviewFieldWithValue(
-                                     ASCIIToUTF16("baz foo")));
-  external_delegate_->DidSelectSuggestion(ASCIIToUTF16("baz foo"),
-                                          POPUP_ITEM_ID_AUTOCOMPLETE_ENTRY);
+                                     ASCIIToUTF16("baz foo"), match_start));
+  external_delegate_->DidSelectSuggestion(
+      ASCIIToUTF16("baz foo"), POPUP_ITEM_ID_AUTOCOMPLETE_ENTRY, match_start);
 }
 
 // Test that the popup is hidden once we are done editing the autofill field.
 TEST_F(AutofillExternalDelegateUnitTest,
        ExternalDelegateHidePopupAfterEditing) {
   EXPECT_CALL(autofill_client_, ShowAutofillPopup(_, _, _, _));
   autofill::GenerateTestAutofillPopup(external_delegate_.get());
 
   EXPECT_CALL(autofill_client_, HideAutofillPopup());
   external_delegate_->DidEndTextFieldEditing();
@@ skipping 150 matching lines @@
   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,
                                           0);
 }
 
 }  // namespace autofill