Interpret '?' and Ctrl-K or Ctrl-E as putting omnibox in keyword search mode for Default Search Pro…

components/omnibox/browser/omnibox_edit_unittest.cc

 // Copyright (c) 2012 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 <stddef.h>
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 33 matching lines @@
   void SetUserText(const base::string16& text,
                    bool update_popup) override {
     text_ = text;
   }
   void SetWindowTextAndCaretPos(const base::string16& text,
                                 size_t caret_pos,
                                 bool update_popup,
                                 bool notify_text_changed) override {
     text_ = text;
   }
-  void SetForcedQuery() override {}
+  void EnterKeywordModeForDefaultSearchProvider() override {}
   bool IsSelectAll() const override { return false; }
   bool DeleteAtEndPressed() override { return false; }
   void GetSelectionBounds(size_t* start, size_t* end) const override {}
   void SelectAll(bool reversed) override {}
   void RevertAll() override {}
   void UpdatePopup() override {}
   void SetFocus() override {}
   void ApplyCaretVisibility() override {}
   void OnTemporaryTextMaybeChanged(const base::string16& display_text,
                                    bool save_original_selection,
@@ skipping 272 matching lines @@
   OmniboxEditModel model(&view, &controller,
                          base::WrapUnique(new TestingOmniboxClient()));
 
   // Test if the model updates the inline autocomplete text in the view.
   EXPECT_EQ(base::string16(), view.inline_autocomplete_text());
   model.SetUserText(UTF8ToUTF16("he"));
   model.OnPopupDataChanged(UTF8ToUTF16("llo"), NULL, base::string16(), false);
   EXPECT_EQ(UTF8ToUTF16("hello"), view.GetText());
   EXPECT_EQ(UTF8ToUTF16("llo"), view.inline_autocomplete_text());
 
-  model.OnAfterPossibleChange(UTF8ToUTF16("he"), UTF8ToUTF16("hel"), 3, 3,
-                              false, true, false, true);
+  base::string16 text_before = UTF8ToUTF16("he");
+  base::string16 text_after = UTF8ToUTF16("hel");
+  OmniboxView::StateChanges state_changes{
+      &text_before, &text_after, 3, 3, false, true, false, false};
+  model.OnAfterPossibleChange(state_changes, true);
   EXPECT_EQ(base::string16(), view.inline_autocomplete_text());
   model.OnPopupDataChanged(UTF8ToUTF16("lo"), NULL, base::string16(), false);
   EXPECT_EQ(UTF8ToUTF16("hello"), view.GetText());
   EXPECT_EQ(UTF8ToUTF16("lo"), view.inline_autocomplete_text());
 
   model.Revert();
   EXPECT_EQ(base::string16(), view.GetText());
   EXPECT_EQ(base::string16(), view.inline_autocomplete_text());
 
   model.SetUserText(UTF8ToUTF16("he"));
   model.OnPopupDataChanged(UTF8ToUTF16("llo"), NULL, base::string16(), false);
   EXPECT_EQ(UTF8ToUTF16("hello"), view.GetText());
   EXPECT_EQ(UTF8ToUTF16("llo"), view.inline_autocomplete_text());
 
   model.AcceptTemporaryTextAsUserText();
   EXPECT_EQ(UTF8ToUTF16("hello"), view.GetText());
   EXPECT_EQ(base::string16(), view.inline_autocomplete_text());
 }