Use SetUserText() in OmniboxViewViews emphasis tests to ensure system coherence.

chrome/browser/ui/views/omnibox/omnibox_view_views_unittest.cc

 // Copyright (c) 2015 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 "chrome/browser/ui/views/omnibox/omnibox_view_views.h"
 
 #include <stddef.h>
 
 #include <memory>
 
 #include "base/macros.h"
 #include "build/build_config.h"
+#include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"
 #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h"
 #include "chrome/browser/command_updater.h"
+#include "chrome/browser/search_engines/template_url_service_factory_test_util.h"
 #include "chrome/browser/ui/omnibox/chrome_omnibox_client.h"
 #include "chrome/browser/ui/omnibox/chrome_omnibox_edit_controller.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/omnibox/browser/omnibox_edit_model.h"
+#include "components/toolbar/test_toolbar_model.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/ime/text_edit_commands.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/keycodes/dom/dom_code.h"
 #include "ui/views/controls/textfield/textfield_test_api.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/input_method/input_method_configuration.h"
 #include "chrome/browser/chromeos/input_method/mock_input_method_manager_impl.h"
@@ skipping 19 matching lines @@
 
   // OmniboxViewViews:
   void EmphasizeURLComponents() override;
 
  private:
   // OmniboxViewViews:
   void UpdatePopup() override;
   void SetEmphasis(bool emphasize, const gfx::Range& range) override;
   void UpdateSchemeStyle(const gfx::Range& range) override;
 
-  // Simplistic test override returns whether a given string looks like a URL
-  // without having to mock AutocompleteClassifier objects and their
-  // dependencies.
-  bool CurrentTextIsURL() override {
-    bool looks_like_url = (text().find(':') != std::string::npos ||
-                           text().find('/') != std::string::npos);
-    return looks_like_url;
-  }
-
   size_t update_popup_call_count_;
   base::string16 update_popup_text_;
   gfx::Range update_popup_selection_range_;
 
   // Range of the last scheme logged by UpdateSchemeStyle().
   gfx::Range scheme_range_;
 
   // Range of the last text emphasized by SetEmphasis().
   gfx::Range emphasis_range_;
 
@@ skipping 47 matching lines @@
 }
 
 void TestingOmniboxViewViews::UpdateSchemeStyle(const gfx::Range& range) {
   scheme_range_ = range;
 }
 
 // TestingOmniboxEditController -----------------------------------------------
 
 class TestingOmniboxEditController : public ChromeOmniboxEditController {
  public:
-  explicit TestingOmniboxEditController(CommandUpdater* command_updater)
-      : ChromeOmniboxEditController(command_updater) {}
+  TestingOmniboxEditController(CommandUpdater* command_updater,
+                               ToolbarModel* toolbar_model)
+      : ChromeOmniboxEditController(command_updater),
+        toolbar_model_(toolbar_model) {}
 
  private:
   // ChromeOmniboxEditController:
   void UpdateWithoutTabRestore() override {}
   void OnChanged() override {}
-  ToolbarModel* GetToolbarModel() override { return nullptr; }
-  const ToolbarModel* GetToolbarModel() const override { return nullptr; }
+  ToolbarModel* GetToolbarModel() override { return toolbar_model_; }
+  const ToolbarModel* GetToolbarModel() const override {
+    return toolbar_model_;
+  }
   content::WebContents* GetWebContents() override { return nullptr; }
 
+  ToolbarModel* toolbar_model_;
+
   DISALLOW_COPY_AND_ASSIGN(TestingOmniboxEditController);
 };
 
 }  // namespace
 
 // OmniboxViewViewsTest -------------------------------------------------------
 
 class OmniboxViewViewsTest : public testing::Test {
  public:
   OmniboxViewViewsTest();
 
   TestingOmniboxViewViews* omnibox_view() { return omnibox_view_.get(); }
   views::Textfield* omnibox_textfield() { return omnibox_view(); }
   ui::TextEditCommand scheduled_text_edit_command() const {
     return test_api_->scheduled_text_edit_command();
   }
 
-  // Sets |new_text| as the text in the omnibox.
-  void SetAndEmphasizeText(const std::string& new_text);
+  // Sets |new_text| as the text in the omnibox.  If |accept_input| is true,
+  // pretends that the user has accepted this input (i.e. it's been navigated
+  // to).
+  void SetAndEmphasizeText(const std::string& new_text,
+                           bool accept_input = true);
 
  private:
   // testing::Test:
   void SetUp() override;
   void TearDown() override;
 
   content::TestBrowserThreadBundle thread_bundle_;
   TestingProfile profile_;
+  TemplateURLServiceFactoryTestUtil util_;
   CommandUpdater command_updater_;
+  TestToolbarModel toolbar_model_;
   TestingOmniboxEditController omnibox_edit_controller_;
   std::unique_ptr<TestingOmniboxViewViews> omnibox_view_;
   std::unique_ptr<views::TextfieldTestApi> test_api_;
 
   DISALLOW_COPY_AND_ASSIGN(OmniboxViewViewsTest);
 };
 
 OmniboxViewViewsTest::OmniboxViewViewsTest()
-    : command_updater_(nullptr), omnibox_edit_controller_(&command_updater_) {}
+    : util_(&profile_),
+      command_updater_(nullptr),
+      omnibox_edit_controller_(&command_updater_, &toolbar_model_) {}
 
-void OmniboxViewViewsTest::SetAndEmphasizeText(const std::string& new_text) {
-  omnibox_view()->SetText(base::ASCIIToUTF16(new_text));
+void OmniboxViewViewsTest::SetAndEmphasizeText(const std::string& new_text,
+                                               bool accept_input) {
+  omnibox_view()->SetUserText(base::ASCIIToUTF16(new_text));
+  if (accept_input) {
+    // We don't need to actually navigate in this case (and doing so in a test
+    // would be difficult); it's sufficient to mark input as "no longer in
+    // progress", and the edit model will assume the current text is a URL.
+    omnibox_view()->model()->SetInputInProgress(false);
+  }
   omnibox_view()->EmphasizeURLComponents();
 }
 
 void OmniboxViewViewsTest::SetUp() {
 #if defined(OS_CHROMEOS)
   chromeos::input_method::InitializeForTesting(
       new chromeos::input_method::MockInputMethodManagerImpl);
 #endif
+  AutocompleteClassifierFactory::GetInstance()->SetTestingFactoryAndUse(
+      &profile_, &AutocompleteClassifierFactory::BuildInstanceFor);
   omnibox_view_ = base::MakeUnique<TestingOmniboxViewViews>(
       &omnibox_edit_controller_,
       base::MakeUnique<ChromeOmniboxClient>(&omnibox_edit_controller_,
                                             &profile_),
       &command_updater_);
   test_api_ = base::MakeUnique<views::TextfieldTestApi>(omnibox_view_.get());
   omnibox_view_->Init();
 }
 
 void OmniboxViewViewsTest::TearDown() {
@@ skipping 36 matching lines @@
       ui::TextEditCommand::MOVE_UP);
   EXPECT_EQ(ui::TextEditCommand::MOVE_UP, scheduled_text_edit_command());
 
   ui::KeyEvent up_pressed(ui::ET_KEY_PRESSED, ui::VKEY_UP, 0);
   omnibox_textfield()->OnKeyEvent(&up_pressed);
   EXPECT_EQ(ui::TextEditCommand::INVALID_COMMAND,
             scheduled_text_edit_command());
 }
 
 // Ensure that the scheme is emphasized for data: URLs.
-TEST_F(OmniboxViewViewsTest, TestEmphasisForDATA) {
+TEST_F(OmniboxViewViewsTest, TestEmphasisForData) {
   SetAndEmphasizeText("data:text/html,Hello%20World");
   EXPECT_EQ(gfx::Range(0, 4), omnibox_view()->scheme_range());
   EXPECT_FALSE(omnibox_view()->base_text_is_emphasized());
   EXPECT_EQ(gfx::Range(0, 4), omnibox_view()->emphasis_range());
 }
 
 // Ensure that the origin is emphasized for http: URLs.
 TEST_F(OmniboxViewViewsTest, TestEmphasisForHTTP) {
   SetAndEmphasizeText("http://www.example.com/path/file.htm");
   EXPECT_EQ(gfx::Range(0, 4), omnibox_view()->scheme_range());
   EXPECT_FALSE(omnibox_view()->base_text_is_emphasized());
   EXPECT_EQ(gfx::Range(7, 22), omnibox_view()->emphasis_range());
 }
 
 // Ensure that the origin is emphasized for https: URLs.
 TEST_F(OmniboxViewViewsTest, TestEmphasisForHTTPS) {
   SetAndEmphasizeText("https://www.example.com/path/file.htm");
   EXPECT_EQ(gfx::Range(0, 5), omnibox_view()->scheme_range());
   EXPECT_FALSE(omnibox_view()->base_text_is_emphasized());
   EXPECT_EQ(gfx::Range(8, 23), omnibox_view()->emphasis_range());
 }
 
 // Ensure that nothing is emphasized for chrome-extension: URLs.
-TEST_F(OmniboxViewViewsTest, TestEmphasisForChromeExtensionScheme) {
+TEST_F(OmniboxViewViewsTest, TestEmphasisForChromeExtension) {
   SetAndEmphasizeText("chrome-extension://ldfbacdbackkjhclmhnjabngnppnkagl");
   EXPECT_EQ(gfx::Range(0, 16), omnibox_view()->scheme_range());
   EXPECT_FALSE(omnibox_view()->base_text_is_emphasized());
   EXPECT_EQ(gfx::Range(), omnibox_view()->emphasis_range());
 }
 
 // Ensure that everything is emphasized for unknown scheme hierarchical URLs.
 TEST_F(OmniboxViewViewsTest, TestEmphasisForUnknownHierarchicalScheme) {
   SetAndEmphasizeText("nosuchscheme://opaque/string");
   EXPECT_EQ(gfx::Range(0, 12), omnibox_view()->scheme_range());
   EXPECT_TRUE(omnibox_view()->base_text_is_emphasized());
   EXPECT_EQ(gfx::Range(), omnibox_view()->emphasis_range());
 }
 
 // Ensure that everything is emphasized for unknown scheme URLs.
 TEST_F(OmniboxViewViewsTest, TestEmphasisForUnknownScheme) {
   SetAndEmphasizeText("nosuchscheme:opaquestring");
   EXPECT_EQ(gfx::Range(0, 12), omnibox_view()->scheme_range());
   EXPECT_TRUE(omnibox_view()->base_text_is_emphasized());
   EXPECT_EQ(gfx::Range(), omnibox_view()->emphasis_range());
 }
 
 // Ensure that the origin is emphasized for URL-like text.
 TEST_F(OmniboxViewViewsTest, TestEmphasisForPartialURLs) {
-  SetAndEmphasizeText("example/path/file");
+  SetAndEmphasizeText("host.com/path/file", false);
   EXPECT_EQ(gfx::Range(), omnibox_view()->scheme_range());
   EXPECT_FALSE(omnibox_view()->base_text_is_emphasized());
-  EXPECT_EQ(gfx::Range(0, 7), omnibox_view()->emphasis_range());
+  EXPECT_EQ(gfx::Range(0, 8), omnibox_view()->emphasis_range());
 }
 
 // Ensure that everything is emphasized for plain text.
 TEST_F(OmniboxViewViewsTest, TestEmphasisForNonURLs) {
-  SetAndEmphasizeText("This is plain text");
+  SetAndEmphasizeText("This is plain text", false);
 
   EXPECT_EQ(gfx::Range(), omnibox_view()->scheme_range());
   EXPECT_TRUE(omnibox_view()->base_text_is_emphasized());
   EXPECT_EQ(gfx::Range(), omnibox_view()->emphasis_range());
 }