Makes chrome://omnibox use mojo

chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

Index: chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
index 2eb5c3b005180405618de3a17c40844661cb45db..db89f9226068d24b8638bfe186fa45528c274568 100644
--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -38,7 +38,6 @@
 #include "chrome/browser/ui/webui/memory_internals/memory_internals_ui.h"
 #include "chrome/browser/ui/webui/net_internals/net_internals_ui.h"
 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
-#include "chrome/browser/ui/webui/omnibox/omnibox_ui.h"
 #include "chrome/browser/ui/webui/options/options_ui.h"
 #include "chrome/browser/ui/webui/password_manager_internals/password_manager_internals_ui.h"
 #include "chrome/browser/ui/webui/performance_monitor/performance_monitor_ui.h"
@@ -153,6 +152,10 @@
 #include "chrome/browser/ui/webui/app_list/start_page_ui.h"
 #endif
 
+#if defined(USE_MOJO)
+#include "chrome/browser/ui/webui/omnibox/omnibox_ui.h"
+#endif
+
 using content::WebUI;
 using content::WebUIController;
 using ui::ExternalWebDialogUI;
@@ -294,8 +297,10 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
   if (url.host() == chrome::kChromeUINewTabHost)
     return &NewWebUI<NewTabUI>;
 #endif
+#if defined(USE_MOJO)
   if (url.host() == chrome::kChromeUIOmniboxHost)
     return &NewWebUI<OmniboxUI>;
+#endif
   if (url.host() == chrome::kChromeUIPasswordManagerInternalsHost &&
       CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnablePasswordManagerInternalsUI)) {