Fix some issues with OmniboxViewViews' use of OmniboxClient.

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/chrome_autocomplete_scheme_classifier.h"
 #include "chrome/browser/command_updater.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 "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"
 #endif
 
 using gfx::Range;
 
 namespace {
 
 // TestingOmniboxView ---------------------------------------------------------
 
 class TestingOmniboxView : public OmniboxViewViews {
  public:
   enum BaseTextEmphasis {
     DEEMPHASIZED,
     EMPHASIZED,
     UNSET,
   };
 
   TestingOmniboxView(OmniboxEditController* controller,
-                     Profile* profile,
+                     std::unique_ptr<OmniboxClient> client,
                      CommandUpdater* command_updater);
 
   static BaseTextEmphasis to_base_text_emphasis(bool emphasize) {
     return emphasize ? EMPHASIZED : DEEMPHASIZED;
   }
 
   void ResetEmphasisTestState();
 
   void CheckUpdatePopupCallInfo(size_t call_count,
                                 const base::string16& text,
@@ skipping 20 matching lines @@
   // 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_ = 0;
   base::string16 update_popup_text_;
   Range update_popup_selection_range_;
-  Profile* profile_;
 
   // Range of the last scheme logged by UpdateSchemeStyle().
   Range scheme_range_;
 
   // Range of the last text emphasized by SetEmphasis().
   Range emphasis_range_;
 
   // SetEmphasis() logs whether the base color of the text is emphasized.
   BaseTextEmphasis base_text_emphasis_ = UNSET;
 
   DISALLOW_COPY_AND_ASSIGN(TestingOmniboxView);
 };
 
 TestingOmniboxView::TestingOmniboxView(OmniboxEditController* controller,
-                                       Profile* profile,
+                                       std::unique_ptr<OmniboxClient> client,
                                        CommandUpdater* command_updater)
     : OmniboxViewViews(controller,
-                       profile,
+                       std::move(client),
                        command_updater,
                        false,
                        nullptr,
-                       gfx::FontList()),
-      profile_(profile) {}
+                       gfx::FontList()) {}
 
 void TestingOmniboxView::ResetEmphasisTestState() {
   base_text_emphasis_ = UNSET;
   emphasis_range_ = Range::InvalidRange();
   scheme_range_ = Range::InvalidRange();
 }
 
 void TestingOmniboxView::CheckUpdatePopupCallInfo(
     size_t call_count,
     const base::string16& text,
     const Range& selection_range) {
   EXPECT_EQ(call_count, update_popup_call_count_);
   EXPECT_EQ(text, update_popup_text_);
   EXPECT_EQ(selection_range, update_popup_selection_range_);
 }
 
 void TestingOmniboxView::EmphasizeURLComponents() {
-  UpdateTextStyle(text(), ChromeAutocompleteSchemeClassifier(profile_));
+  UpdateTextStyle(text(), model()->client()->GetSchemeClassifier());
 }
 
 void TestingOmniboxView::UpdatePopup() {
   ++update_popup_call_count_;
   update_popup_text_ = text();
   update_popup_selection_range_ = GetSelectedRange();
 }
 
 void TestingOmniboxView::SetEmphasis(bool emphasize, const Range& range) {
   if (range == Range::InvalidRange()) {
@@ skipping 67 matching lines @@
   omnibox_view()->SetText(base::ASCIIToUTF16(new_text));
   omnibox_view()->EmphasizeURLComponents();
 }
 
 void OmniboxViewViewsTest::SetUp() {
 #if defined(OS_CHROMEOS)
   chromeos::input_method::InitializeForTesting(
       new chromeos::input_method::MockInputMethodManagerImpl);
 #endif
   omnibox_view_ = base::MakeUnique<TestingOmniboxView>(
-      &omnibox_edit_controller_, &profile_, &command_updater_);
+      &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() {
   omnibox_view_.reset();
 #if defined(OS_CHROMEOS)
   chromeos::input_method::Shutdown();
 #endif
 }
@@ skipping 64 matching lines @@
 
     SetAndEmphasizeText(test_case.input);
     EXPECT_EQ(TestingOmniboxView::to_base_text_emphasis(
                   test_case.expected_base_text_emphasized),
               omnibox_view()->base_text_emphasis());
     EXPECT_EQ(test_case.expected_emphasis_range,
               omnibox_view()->emphasis_range());
     EXPECT_EQ(test_case.expected_scheme_range, omnibox_view()->scheme_range());
   }
 }