Move c/b/ui/search/search.* to c/b/instant/

chrome/browser/ui/webui/omnibox/omnibox_ui_handler.cc

 // 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.
 
 #include "chrome/browser/ui/webui/omnibox/omnibox_ui_handler.h"
 
 #include <string>
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/string16.h"
 #include "base/stringprintf.h"
 #include "base/time.h"
 #include "base/values.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
 #include "chrome/browser/autocomplete/autocomplete_controller.h"
 #include "chrome/browser/autocomplete/autocomplete_input.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/autocomplete/autocomplete_provider.h"
+#include "chrome/browser/instant/search.h"
 #include "chrome/browser/search_engines/template_url.h"
-#include "chrome/browser/ui/search/search.h"
 #include "content/public/browser/web_ui.h"
 
 OmniboxUIHandler::OmniboxUIHandler(Profile* profile): profile_(profile) {
   ResetController();
 }
 
 OmniboxUIHandler::~OmniboxUIHandler() {}
 
 void OmniboxUIHandler::RegisterMessages() {
   web_ui()->RegisterMessageCallback("startOmniboxQuery",
@@ skipping 139 matching lines @@
       true,  // allow exact keyword matches
       AutocompleteInput::ALL_MATCHES));  // want all matches
 }
 
 void OmniboxUIHandler::ResetController() {
   controller_.reset(new AutocompleteController(profile_, this,
       chrome::search::IsInstantExtendedAPIEnabled() ?
           AutocompleteClassifier::kInstantExtendedOmniboxProviders :
           AutocompleteClassifier::kDefaultOmniboxProviders));
 }