Change MojoWebUIController to use mojo::StrongBindingSet.

chrome/browser/ui/webui/omnibox/omnibox_ui_handler.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_WEBUI_OMNIBOX_OMNIBOX_UI_HANDLER_H_
 #define CHROME_BROWSER_UI_WEBUI_OMNIBOX_OMNIBOX_UI_HANDLER_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
-#include "chrome/browser/ui/webui/mojo_web_ui_handler.h"
 #include "chrome/browser/ui/webui/omnibox/omnibox.mojom.h"
 #include "components/omnibox/browser/autocomplete_controller_delegate.h"
 #include "components/omnibox/browser/autocomplete_input.h"
 #include "components/omnibox/browser/autocomplete_match.h"
-#include "mojo/public/cpp/bindings/strong_binding.h"
+
+namespace content {
+class WebUI;
+}
 
 class AutocompleteController;
 class Profile;
 
 // Implementation of OmniboxUIHandlerMojo.  StartOmniboxQuery() calls to a
 // private AutocompleteController. It also listens for updates from the
 // AutocompleteController to OnResultChanged() and passes those results to
 // the OmniboxPage.
 class OmniboxUIHandler : public AutocompleteControllerDelegate,
-                         public OmniboxUIHandlerMojo,
-                         public MojoWebUIHandler {
+                         public OmniboxUIHandlerMojo {
  public:
-  // OmniboxUIHandler is deleted when the supplied pipe is destroyed.
-  OmniboxUIHandler(Profile* profile,
-                   mojo::InterfaceRequest<OmniboxUIHandlerMojo> request);
+  explicit OmniboxUIHandler(content::WebUI* web_ui);
   ~OmniboxUIHandler() override;
 
   // AutocompleteControllerDelegate overrides:
   void OnResultChanged(bool default_match_changed) override;
 
   // OmniboxUIHandlerMojo overrides:
   void StartOmniboxQuery(const mojo::String& input_string,
                          int32_t cursor_position,
                          bool prevent_inline_autocomplete,
                          bool prefer_keyword,
@@ skipping 18 matching lines @@
   // Needed because we also pass timing information in the object we
   // hand back to the javascript.
   base::Time time_omnibox_started_;
 
   // The input used when starting the AutocompleteController.
   AutocompleteInput input_;
 
   // Handle back to the page by which we can pass results.
   OmniboxPagePtr page_;
 
-  // The Profile* handed to us in our constructor.
+  // The Profile* for the content::WebUI handed to us in our constructor.
   Profile* profile_;
 
-  mojo::StrongBinding<OmniboxUIHandlerMojo> binding_;
-
   DISALLOW_COPY_AND_ASSIGN(OmniboxUIHandler);
 };
 
 #endif  // CHROME_BROWSER_UI_WEBUI_OMNIBOX_OMNIBOX_UI_HANDLER_H_