Fix some issues with OmniboxViewViews' use of OmniboxClient.

chrome/browser/ui/views/omnibox/omnibox_view_views.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_VIEW_VIEWS_H_
 #define CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_VIEW_VIEWS_H_
 
 #include <stddef.h>
 
 #include <memory>
 #include <set>
 #include <string>
 
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "build/build_config.h"
 #include "components/omnibox/browser/omnibox_view.h"
 #include "components/security_state/core/security_state.h"
 #include "ui/base/window_open_disposition.h"
 #include "ui/gfx/range/range.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/controls/textfield/textfield_controller.h"
 
 #if defined(OS_CHROMEOS)
 #include "ui/base/ime/chromeos/input_method_manager.h"
 #endif
 
 class CommandUpdater;
 class LocationBarView;
+class OmniboxClient;
 class OmniboxPopupView;
-class Profile;
 
 namespace content {
 class WebContents;
 }  // namespace content
 
 namespace gfx {
 class RenderText;
 }
 
 namespace ui {
 class OSExchangeData;
 }  // namespace ui
 
 // Views-implementation of OmniboxView.
 class OmniboxViewViews
     : public OmniboxView,
       public views::Textfield,
 #if defined(OS_CHROMEOS)
       public
           chromeos::input_method::InputMethodManager::CandidateWindowObserver,
 #endif
       public views::TextfieldController {
  public:
   // The internal view class name.
   static const char kViewClassName[];
 
   OmniboxViewViews(OmniboxEditController* controller,
-                   Profile* profile,
+                   std::unique_ptr<OmniboxClient> client,
                    CommandUpdater* command_updater,
                    bool popup_window_mode,
                    LocationBarView* location_bar,
                    const gfx::FontList& font_list);
   ~OmniboxViewViews() override;
 
   // Initialize, create the underlying views, etc.
   void Init();
 
   // Exposes the RenderText for tests.
@@ skipping 123 matching lines @@
   void OnAfterUserAction(views::Textfield* sender) override;
   void OnAfterCutOrCopy(ui::ClipboardType clipboard_type) override;
   void OnWriteDragData(ui::OSExchangeData* data) override;
   void OnGetDragOperationsForTextfield(int* drag_operations) override;
   void AppendDropFormats(
       int* formats,
       std::set<ui::Clipboard::FormatType>* format_types) override;
   int OnDrop(const ui::OSExchangeData& data) override;
   void UpdateContextMenu(ui::SimpleMenuModel* menu_contents) override;
 
-  Profile* profile_;
-
   // When true, the location bar view is read only and also is has a slightly
   // different presentation (smaller font size). This is used for popups.
   bool popup_window_mode_;
 
   std::unique_ptr<OmniboxPopupView> popup_view_;
 
   security_state::SecurityLevel security_level_;
 
   // Selection persisted across temporary text changes, like popup suggestions.
   gfx::Range saved_temporary_selection_;
@@ skipping 29 matching lines @@
   bool select_all_on_gesture_tap_;
 
   // The time of the first character insert operation that has not yet been
   // painted. Used to measure omnibox responsiveness with a histogram.
   base::TimeTicks insert_char_time_;
 
   DISALLOW_COPY_AND_ASSIGN(OmniboxViewViews);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_VIEW_VIEWS_H_