Omnibox refactor, introduced OmniboxController.

chrome/browser/ui/omnibox/omnibox_edit_model.h

Index: chrome/browser/ui/omnibox/omnibox_edit_model.h
diff --git a/chrome/browser/ui/omnibox/omnibox_edit_model.h b/chrome/browser/ui/omnibox/omnibox_edit_model.h
index af46490a3dc60f95a21af2982ca17b4f548632fa..e524b49c0234b6058f11b9bfd2d274c54f944892 100644
--- a/chrome/browser/ui/omnibox/omnibox_edit_model.h
+++ b/chrome/browser/ui/omnibox/omnibox_edit_model.h
@@ -12,6 +12,7 @@
 #include "base/time.h"
 #include "chrome/browser/autocomplete/autocomplete_controller_delegate.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
+#include "chrome/browser/ui/omnibox/omnibox_controller.h"
 #include "chrome/common/metrics/proto/omnibox_event.pb.h"
 #include "chrome/common/omnibox_focus_state.h"
 #include "content/public/common/page_transition_types.h"
@@ -48,7 +49,7 @@ enum OmniboxFocusChangeReason {
   OMNIBOX_FOCUS_CHANGE_TYPING,
 };
 
-class OmniboxEditModel : public AutocompleteControllerDelegate {
+class OmniboxEditModel {
  public:
   struct State {
     State(bool user_input_in_progress,
@@ -73,7 +74,7 @@ class OmniboxEditModel : public AutocompleteControllerDelegate {
   virtual ~OmniboxEditModel();
 
   AutocompleteController* autocomplete_controller() const {
-    return autocomplete_controller_.get();
+    return omnibox_controller_->autocomplete_controller();
   }
 
   void set_popup_model(OmniboxPopupModel* popup_model) {
@@ -304,6 +305,9 @@ class OmniboxEditModel : public AutocompleteControllerDelegate {
   // is in screen coordinates.
   void OnPopupBoundsChanged(const gfx::Rect& bounds);
 
+  // Called when the results have changed in the OmniboxController.
+  void OnResultChanged(bool default_match_changed);
+
  private:
   friend class InstantTestBase;
 
@@ -332,9 +336,6 @@ class OmniboxEditModel : public AutocompleteControllerDelegate {
                           // he intended to hit "ctrl-enter".
   };
 
-  // AutocompleteControllerDelegate:
-  virtual void OnResultChanged(bool default_match_changed) OVERRIDE;
-
   // Returns true if a query to an autocomplete provider is currently
   // in progress.  This logic should in the future live in
   // AutocompleteController but resides here for now.  This method is used by
@@ -423,7 +424,7 @@ class OmniboxEditModel : public AutocompleteControllerDelegate {
   // the view.
   void SetFocusState(OmniboxFocusState state, OmniboxFocusChangeReason reason);
 
-  scoped_ptr<AutocompleteController> autocomplete_controller_;
+  scoped_ptr<OmniboxController> omnibox_controller_;
 
   OmniboxView* view_;