Move desktop-specific Instant bits to c/b/ui/search.

This is part 2 of the cleanup described in the attached bug.
Also, added sreeram to c/b/ui/search/OWNERS and dhollowa to c/b/instant/OWNERS.

BUG=179184


Review URL: https://chromiumcodereview.appspot.com/12520005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188656 0039d316-1c4b-4281-b951-d872f2087c98

44 files changed, 115 insertions, 113 deletions

diff --git a/chrome/browser/history/DEPS b/chrome/browser/history/DEPS
index 468e583..8cd6107 100644
--- a/chrome/browser/history/DEPS
+++ b/chrome/browser/history/DEPS
@@ -25,7 +25,6 @@ include_rules = [
   "!chrome/browser/content_settings/cookie_settings.h",
   "!chrome/browser/diagnostics/sqlite_diagnostics.h",
   "!chrome/browser/favicon/favicon_service.h",
-  "!chrome/browser/instant/instant_overlay.h",
   "!chrome/browser/omnibox/omnibox_field_trial.h",
   "!chrome/browser/prefs/scoped_user_pref_update.h",
   "!chrome/browser/prerender/prerender_contents.h",
@@ -48,6 +47,7 @@ include_rules = [
   "!chrome/browser/ui/browser_finder.h",
   "!chrome/browser/search_engines/template_url_id.h",
   "!chrome/browser/ui/profile_error_dialog.h",
+  "!chrome/browser/ui/search/instant_overlay.h",
   "!chrome/browser/ui/webui/ntp/most_visited_handler.h",
   "!chrome/browser/ui/webui/ntp/new_tab_ui.h",
 ]
diff --git a/chrome/browser/history/history_tab_helper.cc b/chrome/browser/history/history_tab_helper.cc
index cdc3292..a984557 100644
--- a/chrome/browser/history/history_tab_helper.cc
+++ b/chrome/browser/history/history_tab_helper.cc
@@ -8,11 +8,11 @@
 
 #include "chrome/browser/history/history_service.h"
 #include "chrome/browser/history/history_service_factory.h"
-#include "chrome/browser/instant/instant_overlay.h"
 #include "chrome/browser/prerender/prerender_contents.h"
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/browser/prerender/prerender_manager_factory.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/search/instant_overlay.h"
 #include "chrome/common/render_messages.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
diff --git a/chrome/browser/infobars/infobar_container.cc b/chrome/browser/infobars/infobar_container.cc
index b601744..0dd6371 100644
--- a/chrome/browser/infobars/infobar_container.cc
+++ b/chrome/browser/infobars/infobar_container.cc
@@ -15,7 +15,7 @@
 #include "chrome/browser/api/infobars/infobar_delegate.h"
 #include "chrome/browser/api/infobars/infobar_service.h"
 #include "chrome/browser/infobars/infobar.h"
-#include "chrome/browser/instant/instant_overlay_model.h"
+#include "chrome/browser/ui/search/instant_overlay_model.h"
 #include "chrome/browser/ui/search/search_model.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/notification_details.h"
diff --git a/chrome/browser/infobars/infobar_container.h b/chrome/browser/infobars/infobar_container.h
index 3808fb3..896f112 100644
--- a/chrome/browser/infobars/infobar_container.h
+++ b/chrome/browser/infobars/infobar_container.h
@@ -9,7 +9,7 @@
 
 #include "base/compiler_specific.h"
 #include "base/time.h"
-#include "chrome/browser/instant/instant_overlay_model_observer.h"
+#include "chrome/browser/ui/search/instant_overlay_model_observer.h"
 #include "chrome/browser/ui/search/search_model_observer.h"
 #include "chrome/common/search_types.h"
 #include "content/public/browser/notification_observer.h"
diff --git a/chrome/browser/instant/OWNERS b/chrome/browser/instant/OWNERS
index 20df7d8..8514380 100644
--- a/chrome/browser/instant/OWNERS
+++ b/chrome/browser/instant/OWNERS
@@ -1,2 +1,3 @@
+dhollowa@chromium.org
 sky@chromium.org
 sreeram@chromium.org
diff --git a/chrome/browser/ui/browser_instant_controller.h b/chrome/browser/ui/browser_instant_controller.h
index 21cc6d8..f6d2bde 100644
--- a/chrome/browser/ui/browser_instant_controller.h
+++ b/chrome/browser/ui/browser_instant_controller.h
@@ -10,8 +10,8 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/prefs/public/pref_change_registrar.h"
-#include "chrome/browser/instant/instant_controller.h"
-#include "chrome/browser/instant/instant_unload_handler.h"
+#include "chrome/browser/ui/search/instant_controller.h"
+#include "chrome/browser/ui/search/instant_unload_handler.h"
 #include "chrome/browser/ui/search/search_model_observer.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
diff --git a/chrome/browser/ui/cocoa/tab_contents/instant_overlay_controller_mac.h b/chrome/browser/ui/cocoa/tab_contents/instant_overlay_controller_mac.h
index d989b31..2da31f7 100644
--- a/chrome/browser/ui/cocoa/tab_contents/instant_overlay_controller_mac.h
+++ b/chrome/browser/ui/cocoa/tab_contents/instant_overlay_controller_mac.h
@@ -7,7 +7,7 @@
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "chrome/browser/instant/instant_overlay_controller.h"
+#include "chrome/browser/ui/search/instant_overlay_controller.h"
 
 class Browser;
 @class BrowserWindowController;
diff --git a/chrome/browser/ui/cocoa/tab_contents/instant_overlay_controller_mac.mm b/chrome/browser/ui/cocoa/tab_contents/instant_overlay_controller_mac.mm
index 059b05d..13bad50 100644
--- a/chrome/browser/ui/cocoa/tab_contents/instant_overlay_controller_mac.mm
+++ b/chrome/browser/ui/cocoa/tab_contents/instant_overlay_controller_mac.mm
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/ui/cocoa/tab_contents/instant_overlay_controller_mac.h"
-#include "chrome/browser/instant/instant_overlay_model.h"
 #include "chrome/browser/ui/browser.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
+#include "chrome/browser/ui/cocoa/tab_contents/instant_overlay_controller_mac.h"
 #import "chrome/browser/ui/cocoa/tab_contents/overlayable_contents_controller.h"
+#include "chrome/browser/ui/search/instant_overlay_model.h"
 
 InstantOverlayControllerMac::InstantOverlayControllerMac(
     Browser* browser,
diff --git a/chrome/browser/ui/cocoa/tab_contents/overlayable_contents_controller_browsertest.mm b/chrome/browser/ui/cocoa/tab_contents/overlayable_contents_controller_browsertest.mm
index 4b3c0c3..049d61c 100644
--- a/chrome/browser/ui/cocoa/tab_contents/overlayable_contents_controller_browsertest.mm
+++ b/chrome/browser/ui/cocoa/tab_contents/overlayable_contents_controller_browsertest.mm
@@ -4,13 +4,13 @@
 
 #import "chrome/browser/ui/cocoa/tab_contents/overlayable_contents_controller.h"
 
-#include "chrome/browser/instant/instant_overlay_model.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/cocoa/browser_window_controller.h"
 #include "chrome/browser/ui/cocoa/tab_contents/instant_overlay_controller_mac.h"
 #include "chrome/browser/ui/cocoa/tab_contents/overlay_drop_shadow_view.h"
+#include "chrome/browser/ui/search/instant_overlay_model.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/web_contents.h"
diff --git a/chrome/browser/ui/gtk/instant_overlay_controller_gtk.cc b/chrome/browser/ui/gtk/instant_overlay_controller_gtk.cc
index 95f1d75..1180fca 100644
--- a/chrome/browser/ui/gtk/instant_overlay_controller_gtk.cc
+++ b/chrome/browser/ui/gtk/instant_overlay_controller_gtk.cc
@@ -4,9 +4,9 @@
 
 #include "chrome/browser/ui/gtk/instant_overlay_controller_gtk.h"
 
-#include "chrome/browser/instant/instant_overlay_model.h"
 #include "chrome/browser/ui/gtk/browser_window_gtk.h"
 #include "chrome/browser/ui/gtk/tab_contents_container_gtk.h"
+#include "chrome/browser/ui/search/instant_overlay_model.h"
 
 InstantOverlayControllerGtk::InstantOverlayControllerGtk(
     BrowserWindowGtk* window,
diff --git a/chrome/browser/ui/gtk/instant_overlay_controller_gtk.h b/chrome/browser/ui/gtk/instant_overlay_controller_gtk.h
index 771746b..084bc4a 100644
--- a/chrome/browser/ui/gtk/instant_overlay_controller_gtk.h
+++ b/chrome/browser/ui/gtk/instant_overlay_controller_gtk.h
@@ -7,7 +7,7 @@
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "chrome/browser/instant/instant_overlay_controller.h"
+#include "chrome/browser/ui/search/instant_overlay_controller.h"
 
 class BrowserWindowGtk;
 class TabContentsContainerGtk;
diff --git a/chrome/browser/ui/omnibox/omnibox_edit_model.cc b/chrome/browser/ui/omnibox/omnibox_edit_model.cc
index c04a3bb..bb5c0c5 100644
--- a/chrome/browser/ui/omnibox/omnibox_edit_model.cc
+++ b/chrome/browser/ui/omnibox/omnibox_edit_model.cc
@@ -26,7 +26,6 @@
 #include "chrome/browser/command_updater.h"
 #include "chrome/browser/extensions/api/omnibox/omnibox_api.h"
 #include "chrome/browser/google/google_url_tracker.h"
-#include "chrome/browser/instant/instant_controller.h"
 #include "chrome/browser/instant/search.h"
 #include "chrome/browser/net/predictor.h"
 #include "chrome/browser/net/url_fixer_upper.h"
@@ -47,6 +46,7 @@
 #include "chrome/browser/ui/omnibox/omnibox_popup_model.h"
 #include "chrome/browser/ui/omnibox/omnibox_popup_view.h"
 #include "chrome/browser/ui/omnibox/omnibox_view.h"
+#include "chrome/browser/ui/search/instant_controller.h"
 #include "chrome/browser/ui/search/search_tab_helper.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
diff --git a/chrome/browser/ui/search/OWNERS b/chrome/browser/ui/search/OWNERS
index f337d4e..8514380 100644
--- a/chrome/browser/ui/search/OWNERS
+++ b/chrome/browser/ui/search/OWNERS
@@ -1,2 +1,3 @@
 dhollowa@chromium.org
 sky@chromium.org
+sreeram@chromium.org
diff --git a/chrome/browser/instant/instant_browsertest.cc b/chrome/browser/ui/search/instant_browsertest.cc
index 11b42d3..74b4947 100644
--- a/chrome/browser/instant/instant_browsertest.cc
+++ b/chrome/browser/ui/search/instant_browsertest.cc
@@ -4,10 +4,8 @@
 
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/history/history_service_factory.h"
-#include "chrome/browser/instant/instant_overlay.h"
 #include "chrome/browser/instant/instant_service.h"
 #include "chrome/browser/instant/instant_service_factory.h"
-#include "chrome/browser/instant/instant_test_utils.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
@@ -17,6 +15,8 @@
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/omnibox/omnibox_view.h"
+#include "chrome/browser/ui/search/instant_overlay.h"
+#include "chrome/browser/ui/search/instant_test_utils.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/in_process_browser_test.h"
diff --git a/chrome/browser/instant/instant_commit_type.h b/chrome/browser/ui/search/instant_commit_type.h
index 7da72a5..3ead857 100644
--- a/chrome/browser/instant/instant_commit_type.h
+++ b/chrome/browser/ui/search/instant_commit_type.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_INSTANT_INSTANT_COMMIT_TYPE_H_
-#define CHROME_BROWSER_INSTANT_INSTANT_COMMIT_TYPE_H_
+#ifndef CHROME_BROWSER_UI_SEARCH_INSTANT_COMMIT_TYPE_H_
+#define CHROME_BROWSER_UI_SEARCH_INSTANT_COMMIT_TYPE_H_
 
 // Reason why the Instant overlay is committed (merged into a tab).
 enum InstantCommitType {
@@ -22,4 +22,4 @@ enum InstantCommitType {
   INSTANT_COMMIT_NAVIGATED,
 };
 
-#endif  // CHROME_BROWSER_INSTANT_INSTANT_COMMIT_TYPE_H_
+#endif  // CHROME_BROWSER_UI_SEARCH_INSTANT_COMMIT_TYPE_H_
diff --git a/chrome/browser/instant/instant_controller.cc b/chrome/browser/ui/search/instant_controller.cc
index 924688c..05a388e 100644
--- a/chrome/browser/instant/instant_controller.cc
+++ b/chrome/browser/ui/search/instant_controller.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/instant/instant_controller.h"
+#include "chrome/browser/ui/search/instant_controller.h"
 
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
@@ -13,17 +13,17 @@
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/history/history_tab_helper.h"
 #include "chrome/browser/history/top_sites.h"
-#include "chrome/browser/instant/instant_ntp.h"
-#include "chrome/browser/instant/instant_overlay.h"
 #include "chrome/browser/instant/instant_service.h"
 #include "chrome/browser/instant/instant_service_factory.h"
-#include "chrome/browser/instant/instant_tab.h"
 #include "chrome/browser/instant/search.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/search_engines/search_terms_data.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/ui/browser_instant_controller.h"
+#include "chrome/browser/ui/search/instant_ntp.h"
+#include "chrome/browser/ui/search/instant_overlay.h"
+#include "chrome/browser/ui/search/instant_tab.h"
 #include "chrome/browser/ui/search/search_tab_helper.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
diff --git a/chrome/browser/instant/instant_controller.h b/chrome/browser/ui/search/instant_controller.h
index ef32619..4c5ceb5 100644
--- a/chrome/browser/instant/instant_controller.h
+++ b/chrome/browser/ui/search/instant_controller.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_INSTANT_INSTANT_CONTROLLER_H_
-#define CHROME_BROWSER_INSTANT_INSTANT_CONTROLLER_H_
+#ifndef CHROME_BROWSER_UI_SEARCH_INSTANT_CONTROLLER_H_
+#define CHROME_BROWSER_UI_SEARCH_INSTANT_CONTROLLER_H_
 
 #include <list>
 #include <map>
@@ -18,10 +18,10 @@
 #include "base/time.h"
 #include "base/timer.h"
 #include "chrome/browser/history/history_types.h"
-#include "chrome/browser/instant/instant_commit_type.h"
-#include "chrome/browser/instant/instant_overlay_model.h"
-#include "chrome/browser/instant/instant_page.h"
 #include "chrome/browser/ui/omnibox/omnibox_edit_model.h"
+#include "chrome/browser/ui/search/instant_commit_type.h"
+#include "chrome/browser/ui/search/instant_overlay_model.h"
+#include "chrome/browser/ui/search/instant_page.h"
 #include "chrome/common/instant_types.h"
 #include "chrome/common/search_types.h"
 #include "content/public/browser/notification_observer.h"
@@ -465,4 +465,4 @@ class InstantController : public InstantPage::Delegate,
   DISALLOW_COPY_AND_ASSIGN(InstantController);
 };
 
-#endif  // CHROME_BROWSER_INSTANT_INSTANT_CONTROLLER_H_
+#endif  // CHROME_BROWSER_UI_SEARCH_INSTANT_CONTROLLER_H_
diff --git a/chrome/browser/instant/instant_extended_browsertest.cc b/chrome/browser/ui/search/instant_extended_browsertest.cc
index 6b2e4af..d3935ae 100644
--- a/chrome/browser/instant/instant_extended_browsertest.cc
+++ b/chrome/browser/ui/search/instant_extended_browsertest.cc
@@ -16,18 +16,18 @@
 #include "chrome/browser/favicon/favicon_tab_helper.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/history/top_sites.h"
-#include "chrome/browser/instant/instant_commit_type.h"
-#include "chrome/browser/instant/instant_ntp.h"
-#include "chrome/browser/instant/instant_overlay.h"
 #include "chrome/browser/instant/instant_service.h"
 #include "chrome/browser/instant/instant_service_factory.h"
-#include "chrome/browser/instant/instant_tab.h"
-#include "chrome/browser/instant/instant_test_utils.h"
 #include "chrome/browser/instant/search.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/omnibox/omnibox_view.h"
+#include "chrome/browser/ui/search/instant_commit_type.h"
+#include "chrome/browser/ui/search/instant_ntp.h"
+#include "chrome/browser/ui/search/instant_overlay.h"
+#include "chrome/browser/ui/search/instant_tab.h"
+#include "chrome/browser/ui/search/instant_test_utils.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/webui/theme_source.h"
 #include "chrome/common/chrome_notification_types.h"
diff --git a/chrome/browser/instant/instant_extended_manual_browsertest.cc b/chrome/browser/ui/search/instant_extended_manual_browsertest.cc
index 9e9c4f8..332d311 100644
--- a/chrome/browser/instant/instant_extended_manual_browsertest.cc
+++ b/chrome/browser/ui/search/instant_extended_manual_browsertest.cc
@@ -3,8 +3,6 @@
 // found in the LICENSE file.
 
 #include "base/string_util.h"
-#include "chrome/browser/instant/instant_overlay.h"
-#include "chrome/browser/instant/instant_test_utils.h"
 #include "chrome/browser/instant/search.h"
 #include "chrome/browser/task_manager/task_manager.h"
 #include "chrome/browser/task_manager/task_manager_browsertest_util.h"
@@ -12,6 +10,8 @@
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/omnibox/omnibox_view.h"
+#include "chrome/browser/ui/search/instant_overlay.h"
+#include "chrome/browser/ui/search/instant_test_utils.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/test/base/in_process_browser_test.h"
diff --git a/chrome/browser/instant/instant_loader.cc b/chrome/browser/ui/search/instant_loader.cc
index aa6c3b9..2137598 100644
--- a/chrome/browser/instant/instant_loader.cc
+++ b/chrome/browser/ui/search/instant_loader.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/instant/instant_loader.h"
+#include "chrome/browser/ui/search/instant_loader.h"
 
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/extensions/api/web_navigation/web_navigation_api.h"
diff --git a/chrome/browser/instant/instant_loader.h b/chrome/browser/ui/search/instant_loader.h
index a4440ea..1d5c693 100644
--- a/chrome/browser/instant/instant_loader.h
+++ b/chrome/browser/ui/search/instant_loader.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_INSTANT_INSTANT_LOADER_H_
-#define CHROME_BROWSER_INSTANT_INSTANT_LOADER_H_
+#ifndef CHROME_BROWSER_UI_SEARCH_INSTANT_LOADER_H_
+#define CHROME_BROWSER_UI_SEARCH_INSTANT_LOADER_H_
 
 #include "base/basictypes.h"
 #include "base/callback.h"
@@ -134,4 +134,4 @@ class InstantLoader : public content::NotificationObserver,
   DISALLOW_COPY_AND_ASSIGN(InstantLoader);
 };
 
-#endif  // CHROME_BROWSER_INSTANT_INSTANT_LOADER_H_
+#endif  // CHROME_BROWSER_UI_SEARCH_INSTANT_LOADER_H_
diff --git a/chrome/browser/instant/instant_ntp.cc b/chrome/browser/ui/search/instant_ntp.cc
index bec8183..852fcb0 100644
--- a/chrome/browser/instant/instant_ntp.cc
+++ b/chrome/browser/ui/search/instant_ntp.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/instant/instant_ntp.h"
+#include "chrome/browser/ui/search/instant_ntp.h"
 
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
diff --git a/chrome/browser/instant/instant_ntp.h b/chrome/browser/ui/search/instant_ntp.h
index f719c5b..0c683f5 100644
--- a/chrome/browser/instant/instant_ntp.h
+++ b/chrome/browser/ui/search/instant_ntp.h
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_INSTANT_INSTANT_NTP_H_
-#define CHROME_BROWSER_INSTANT_INSTANT_NTP_H_
+#ifndef CHROME_BROWSER_UI_SEARCH_INSTANT_NTP_H_
+#define CHROME_BROWSER_UI_SEARCH_INSTANT_NTP_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
-#include "chrome/browser/instant/instant_loader.h"
-#include "chrome/browser/instant/instant_page.h"
+#include "chrome/browser/ui/search/instant_loader.h"
+#include "chrome/browser/ui/search/instant_page.h"
 
 class Profile;
 
@@ -60,4 +60,4 @@ class InstantNTP : public InstantPage,
   DISALLOW_COPY_AND_ASSIGN(InstantNTP);
 };
 
-#endif  // CHROME_BROWSER_INSTANT_INSTANT_NTP_H_
+#endif  // CHROME_BROWSER_UI_SEARCH_INSTANT_NTP_H_
diff --git a/chrome/browser/instant/instant_overlay.cc b/chrome/browser/ui/search/instant_overlay.cc
index 9a9cef7..c056e38 100644
--- a/chrome/browser/instant/instant_overlay.cc
+++ b/chrome/browser/ui/search/instant_overlay.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/instant/instant_overlay.h"
+#include "chrome/browser/ui/search/instant_overlay.h"
 
 #include "base/auto_reset.h"
 #include "base/supports_user_data.h"
diff --git a/chrome/browser/instant/instant_overlay.h b/chrome/browser/ui/search/instant_overlay.h
index 2e1c6ca..f20a986 100644
--- a/chrome/browser/instant/instant_overlay.h
+++ b/chrome/browser/ui/search/instant_overlay.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_INSTANT_INSTANT_OVERLAY_H_
-#define CHROME_BROWSER_INSTANT_INSTANT_OVERLAY_H_
+#ifndef CHROME_BROWSER_UI_SEARCH_INSTANT_OVERLAY_H_
+#define CHROME_BROWSER_UI_SEARCH_INSTANT_OVERLAY_H_
 
 #include <string>
 
@@ -12,9 +12,9 @@
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/history/history_types.h"
-#include "chrome/browser/instant/instant_controller.h"
-#include "chrome/browser/instant/instant_loader.h"
-#include "chrome/browser/instant/instant_page.h"
+#include "chrome/browser/ui/search/instant_controller.h"
+#include "chrome/browser/ui/search/instant_loader.h"
+#include "chrome/browser/ui/search/instant_page.h"
 
 class Profile;
 
@@ -115,4 +115,4 @@ class InstantOverlay : public InstantPage,
   DISALLOW_COPY_AND_ASSIGN(InstantOverlay);
 };
 
-#endif  // CHROME_BROWSER_INSTANT_INSTANT_OVERLAY_H_
+#endif  // CHROME_BROWSER_UI_SEARCH_INSTANT_OVERLAY_H_
diff --git a/chrome/browser/instant/instant_overlay_controller.cc b/chrome/browser/ui/search/instant_overlay_controller.cc
index 2ecaff9..547ccab 100644
--- a/chrome/browser/instant/instant_overlay_controller.cc
+++ b/chrome/browser/ui/search/instant_overlay_controller.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/instant/instant_overlay_controller.h"
+#include "chrome/browser/ui/search/instant_overlay_controller.h"
 
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_instant_controller.h"
diff --git a/chrome/browser/instant/instant_overlay_controller.h b/chrome/browser/ui/search/instant_overlay_controller.h
index a2464f1..0606ff5 100644
--- a/chrome/browser/instant/instant_overlay_controller.h
+++ b/chrome/browser/ui/search/instant_overlay_controller.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_INSTANT_INSTANT_OVERLAY_CONTROLLER_H_
-#define CHROME_BROWSER_INSTANT_INSTANT_OVERLAY_CONTROLLER_H_
+#ifndef CHROME_BROWSER_UI_SEARCH_INSTANT_OVERLAY_CONTROLLER_H_
+#define CHROME_BROWSER_UI_SEARCH_INSTANT_OVERLAY_CONTROLLER_H_
 
 #include "base/compiler_specific.h"
-#include "chrome/browser/instant/instant_overlay_model_observer.h"
+#include "chrome/browser/ui/search/instant_overlay_model_observer.h"
 
 class Browser;
 class InstantOverlayModel;
@@ -25,4 +25,4 @@ class InstantOverlayController : public InstantOverlayModelObserver {
       const InstantOverlayModel& model) OVERRIDE = 0;
 };
 
-#endif  // CHROME_BROWSER_INSTANT_INSTANT_OVERLAY_CONTROLLER_H_
+#endif  // CHROME_BROWSER_UI_SEARCH_INSTANT_OVERLAY_CONTROLLER_H_
diff --git a/chrome/browser/instant/instant_overlay_model.cc b/chrome/browser/ui/search/instant_overlay_model.cc
index f08b74a..fba64ee 100644
--- a/chrome/browser/instant/instant_overlay_model.cc
+++ b/chrome/browser/ui/search/instant_overlay_model.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/instant/instant_overlay_model.h"
+#include "chrome/browser/ui/search/instant_overlay_model.h"
 
-#include "chrome/browser/instant/instant_controller.h"
-#include "chrome/browser/instant/instant_overlay_model_observer.h"
+#include "chrome/browser/ui/search/instant_controller.h"
+#include "chrome/browser/ui/search/instant_overlay_model_observer.h"
 
 InstantOverlayModel::InstantOverlayModel(InstantController* controller)
   : height_(0),
diff --git a/chrome/browser/instant/instant_overlay_model.h b/chrome/browser/ui/search/instant_overlay_model.h
index d8203be..ccad808 100644
--- a/chrome/browser/instant/instant_overlay_model.h
+++ b/chrome/browser/ui/search/instant_overlay_model.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_INSTANT_INSTANT_OVERLAY_MODEL_H_
-#define CHROME_BROWSER_INSTANT_INSTANT_OVERLAY_MODEL_H_
+#ifndef CHROME_BROWSER_UI_SEARCH_INSTANT_OVERLAY_MODEL_H_
+#define CHROME_BROWSER_UI_SEARCH_INSTANT_OVERLAY_MODEL_H_
 
 #include "base/basictypes.h"
 #include "base/observer_list.h"
@@ -61,4 +61,4 @@ class InstantOverlayModel {
   DISALLOW_COPY_AND_ASSIGN(InstantOverlayModel);
 };
 
-#endif  // CHROME_BROWSER_INSTANT_INSTANT_OVERLAY_MODEL_H_
+#endif  // CHROME_BROWSER_UI_SEARCH_INSTANT_OVERLAY_MODEL_H_
diff --git a/chrome/browser/instant/instant_overlay_model_observer.h b/chrome/browser/ui/search/instant_overlay_model_observer.h
index 7169ce8..a3cb113 100644
--- a/chrome/browser/instant/instant_overlay_model_observer.h
+++ b/chrome/browser/ui/search/instant_overlay_model_observer.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_INSTANT_INSTANT_OVERLAY_MODEL_OBSERVER_H_
-#define CHROME_BROWSER_INSTANT_INSTANT_OVERLAY_MODEL_OBSERVER_H_
+#ifndef CHROME_BROWSER_UI_SEARCH_INSTANT_OVERLAY_MODEL_OBSERVER_H_
+#define CHROME_BROWSER_UI_SEARCH_INSTANT_OVERLAY_MODEL_OBSERVER_H_
 
 class InstantOverlayModel;
 
@@ -18,4 +18,4 @@ class InstantOverlayModelObserver {
   ~InstantOverlayModelObserver() {}
 };
 
-#endif  // CHROME_BROWSER_INSTANT_INSTANT_OVERLAY_MODEL_OBSERVER_H_
+#endif  // CHROME_BROWSER_UI_SEARCH_INSTANT_OVERLAY_MODEL_OBSERVER_H_
diff --git a/chrome/browser/instant/instant_page.cc b/chrome/browser/ui/search/instant_page.cc
index cbb0390..f87dc36 100644
--- a/chrome/browser/instant/instant_page.cc
+++ b/chrome/browser/ui/search/instant_page.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/instant/instant_page.h"
+#include "chrome/browser/ui/search/instant_page.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/common/render_messages.h"
diff --git a/chrome/browser/instant/instant_page.h b/chrome/browser/ui/search/instant_page.h
index 5361d65..8ddaf0a 100644
--- a/chrome/browser/instant/instant_page.h
+++ b/chrome/browser/ui/search/instant_page.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_INSTANT_INSTANT_PAGE_H_
-#define CHROME_BROWSER_INSTANT_INSTANT_PAGE_H_
+#ifndef CHROME_BROWSER_UI_SEARCH_INSTANT_PAGE_H_
+#define CHROME_BROWSER_UI_SEARCH_INSTANT_PAGE_H_
 
 #include <vector>
 
@@ -236,4 +236,4 @@ class InstantPage : public content::WebContentsObserver {
   DISALLOW_COPY_AND_ASSIGN(InstantPage);
 };
 
-#endif  // CHROME_BROWSER_INSTANT_INSTANT_PAGE_H_
+#endif  // CHROME_BROWSER_UI_SEARCH_INSTANT_PAGE_H_
diff --git a/chrome/browser/instant/instant_tab.cc b/chrome/browser/ui/search/instant_tab.cc
index 89e0ba3..f7da358 100644
--- a/chrome/browser/instant/instant_tab.cc
+++ b/chrome/browser/ui/search/instant_tab.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/instant/instant_tab.h"
+#include "chrome/browser/ui/search/instant_tab.h"
 
 InstantTab::InstantTab(InstantPage::Delegate* delegate)
     : InstantPage(delegate) {
diff --git a/chrome/browser/instant/instant_tab.h b/chrome/browser/ui/search/instant_tab.h
index 131e227..0d41984 100644
--- a/chrome/browser/instant/instant_tab.h
+++ b/chrome/browser/ui/search/instant_tab.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_INSTANT_INSTANT_TAB_H_
-#define CHROME_BROWSER_INSTANT_INSTANT_TAB_H_
+#ifndef CHROME_BROWSER_UI_SEARCH_INSTANT_TAB_H_
+#define CHROME_BROWSER_UI_SEARCH_INSTANT_TAB_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "chrome/browser/instant/instant_page.h"
+#include "chrome/browser/ui/search/instant_page.h"
 
 // InstantTab represents a committed page (i.e. an actual tab on the tab strip)
 // that supports the Instant API.
@@ -31,4 +31,4 @@ class InstantTab : public InstantPage {
   DISALLOW_COPY_AND_ASSIGN(InstantTab);
 };
 
-#endif  // CHROME_BROWSER_INSTANT_INSTANT_TAB_H_
+#endif  // CHROME_BROWSER_UI_SEARCH_INSTANT_TAB_H_
diff --git a/chrome/browser/instant/instant_test_utils.cc b/chrome/browser/ui/search/instant_test_utils.cc
index 2bdfe59..58b5ca2 100644
--- a/chrome/browser/instant/instant_test_utils.cc
+++ b/chrome/browser/ui/search/instant_test_utils.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/instant/instant_test_utils.h"
+#include "chrome/browser/ui/search/instant_test_utils.h"
 
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
diff --git a/chrome/browser/instant/instant_test_utils.h b/chrome/browser/ui/search/instant_test_utils.h
index c349cba..fce05ba 100644
--- a/chrome/browser/instant/instant_test_utils.h
+++ b/chrome/browser/ui/search/instant_test_utils.h
@@ -2,20 +2,20 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_INSTANT_INSTANT_TEST_UTILS_H_
-#define CHROME_BROWSER_INSTANT_INSTANT_TEST_UTILS_H_
+#ifndef CHROME_BROWSER_UI_SEARCH_INSTANT_TEST_UTILS_H_
+#define CHROME_BROWSER_UI_SEARCH_INSTANT_TEST_UTILS_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/run_loop.h"
-#include "chrome/browser/instant/instant_controller.h"
-#include "chrome/browser/instant/instant_overlay_model_observer.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_instant_controller.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/omnibox/location_bar.h"
+#include "chrome/browser/ui/search/instant_controller.h"
+#include "chrome/browser/ui/search/instant_overlay_model_observer.h"
 #include "chrome/common/search_types.h"
 #include "googleurl/src/gurl.h"
 #include "net/test/test_server.h"
@@ -122,4 +122,4 @@ class InstantTestBase {
   DISALLOW_COPY_AND_ASSIGN(InstantTestBase);
 };
 
-#endif  // CHROME_BROWSER_INSTANT_INSTANT_TEST_UTILS_H_
+#endif  // CHROME_BROWSER_UI_SEARCH_INSTANT_TEST_UTILS_H_
diff --git a/chrome/browser/instant/instant_unload_handler.cc b/chrome/browser/ui/search/instant_unload_handler.cc
index fa64ed1..4c9ff71 100644
--- a/chrome/browser/instant/instant_unload_handler.cc
+++ b/chrome/browser/ui/search/instant_unload_handler.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/instant/instant_unload_handler.h"
+#include "chrome/browser/ui/search/instant_unload_handler.h"
 
 #include <algorithm>
 
diff --git a/chrome/browser/instant/instant_unload_handler.h b/chrome/browser/ui/search/instant_unload_handler.h
index deaf0b7..fa6b264 100644
--- a/chrome/browser/instant/instant_unload_handler.h
+++ b/chrome/browser/ui/search/instant_unload_handler.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_INSTANT_INSTANT_UNLOAD_HANDLER_H_
-#define CHROME_BROWSER_INSTANT_INSTANT_UNLOAD_HANDLER_H_
+#ifndef CHROME_BROWSER_UI_SEARCH_INSTANT_UNLOAD_HANDLER_H_
+#define CHROME_BROWSER_UI_SEARCH_INSTANT_UNLOAD_HANDLER_H_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
@@ -62,4 +62,4 @@ class InstantUnloadHandler {
   DISALLOW_COPY_AND_ASSIGN(InstantUnloadHandler);
 };
 
-#endif  // CHROME_BROWSER_INSTANT_INSTANT_UNLOAD_HANDLER_H_
+#endif  // CHROME_BROWSER_UI_SEARCH_INSTANT_UNLOAD_HANDLER_H_
diff --git a/chrome/browser/ui/views/frame/instant_overlay_controller_views.cc b/chrome/browser/ui/views/frame/instant_overlay_controller_views.cc
index ef8fdbb..097d415 100644
--- a/chrome/browser/ui/views/frame/instant_overlay_controller_views.cc
+++ b/chrome/browser/ui/views/frame/instant_overlay_controller_views.cc
@@ -4,9 +4,9 @@
 
 #include "chrome/browser/ui/views/frame/instant_overlay_controller_views.h"
 
-#include "chrome/browser/instant/instant_overlay_model.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/search/instant_overlay_model.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/frame/contents_container.h"
diff --git a/chrome/browser/ui/views/frame/instant_overlay_controller_views.h b/chrome/browser/ui/views/frame/instant_overlay_controller_views.h
index f0c79f7..4f430eb 100644
--- a/chrome/browser/ui/views/frame/instant_overlay_controller_views.h
+++ b/chrome/browser/ui/views/frame/instant_overlay_controller_views.h
@@ -8,7 +8,7 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
-#include "chrome/browser/instant/instant_overlay_controller.h"
+#include "chrome/browser/ui/search/instant_overlay_controller.h"
 
 class Browser;
 class ContentsContainer;
diff --git a/chrome/browser/ui/webui/instant_ui.cc b/chrome/browser/ui/webui/instant_ui.cc
index 0e00082..f84bf9a 100644
--- a/chrome/browser/ui/webui/instant_ui.cc
+++ b/chrome/browser/ui/webui/instant_ui.cc
@@ -8,11 +8,11 @@
 #include "base/prefs/pref_service.h"
 #include "base/stringprintf.h"
 #include "base/time.h"
-#include "chrome/browser/instant/instant_controller.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_instant_controller.h"
+#include "chrome/browser/ui/search/instant_controller.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "components/user_prefs/pref_registry_syncable.h"
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 91c1130..803f2b2 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -851,32 +851,12 @@
         'browser/infobars/infobar_tab_helper.h',
         'browser/infobars/insecure_content_infobar_delegate.cc',
         'browser/infobars/insecure_content_infobar_delegate.h',
-        'browser/instant/instant_commit_type.h',
-        'browser/instant/instant_controller.cc',
-        'browser/instant/instant_controller.h',
         'browser/instant/instant_io_context.cc',
         'browser/instant/instant_io_context.h',
-        'browser/instant/instant_loader.cc',
-        'browser/instant/instant_loader.h',
-        'browser/instant/instant_ntp.cc',
-        'browser/instant/instant_ntp.h',
-        'browser/instant/instant_overlay.cc',
-        'browser/instant/instant_overlay.h',
-        'browser/instant/instant_overlay_controller.cc',
-        'browser/instant/instant_overlay_controller.h',
-        'browser/instant/instant_overlay_model.cc',
-        'browser/instant/instant_overlay_model.h',
-        'browser/instant/instant_overlay_model_observer.h',
-        'browser/instant/instant_page.h',
-        'browser/instant/instant_page.cc',
         'browser/instant/instant_service.cc',
         'browser/instant/instant_service.h',
         'browser/instant/instant_service_factory.cc',
         'browser/instant/instant_service_factory.h',
-        'browser/instant/instant_tab.cc',
-        'browser/instant/instant_tab.h',
-        'browser/instant/instant_unload_handler.cc',
-        'browser/instant/instant_unload_handler.h',
         'browser/instant/local_omnibox_popup_source.cc',
         'browser/instant/local_omnibox_popup_source.h',
         'browser/instant/search.cc',
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
index 50796fc..a7f3ef5 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -1261,6 +1261,26 @@
         'browser/ui/sad_tab_types.h',
         'browser/ui/screen_capture_infobar_delegate.cc',
         'browser/ui/screen_capture_infobar_delegate.h',
+        'browser/ui/search/instant_commit_type.h',
+        'browser/ui/search/instant_controller.cc',
+        'browser/ui/search/instant_controller.h',
+        'browser/ui/search/instant_loader.cc',
+        'browser/ui/search/instant_loader.h',
+        'browser/ui/search/instant_ntp.cc',
+        'browser/ui/search/instant_ntp.h',
+        'browser/ui/search/instant_overlay.cc',
+        'browser/ui/search/instant_overlay.h',
+        'browser/ui/search/instant_overlay_controller.cc',
+        'browser/ui/search/instant_overlay_controller.h',
+        'browser/ui/search/instant_overlay_model.cc',
+        'browser/ui/search/instant_overlay_model.h',
+        'browser/ui/search/instant_overlay_model_observer.h',
+        'browser/ui/search/instant_page.cc',
+        'browser/ui/search/instant_page.h',
+        'browser/ui/search/instant_tab.cc',
+        'browser/ui/search/instant_tab.h',
+        'browser/ui/search/instant_unload_handler.cc',
+        'browser/ui/search/instant_unload_handler.h',
         'browser/ui/search/search_delegate.cc',
         'browser/ui/search/search_delegate.h',
         'browser/ui/search/search_model.cc',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 52a77ef..8547759 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -195,11 +195,6 @@
         'browser/extensions/window_open_interactive_apitest.cc',
         'browser/extensions/extension_fullscreen_apitest.cc',
         'browser/extensions/extension_pointer_lock_apitest.cc',
-        'browser/instant/instant_browsertest.cc',
-        'browser/instant/instant_extended_browsertest.cc',
-        'browser/instant/instant_extended_manual_browsertest.cc',
-        'browser/instant/instant_test_utils.h',
-        'browser/instant/instant_test_utils.cc',
         'browser/mouseleave_browsertest.cc',
         'browser/notifications/desktop_notifications_unittest.cc',
         'browser/notifications/desktop_notifications_unittest.h',
@@ -231,6 +226,11 @@
         'browser/ui/panels/test_panel_notification_observer.h',
         'browser/ui/panels/test_panel_collection_squeeze_observer.cc',
         'browser/ui/panels/test_panel_collection_squeeze_observer.h',
+        'browser/ui/search/instant_browsertest.cc',
+        'browser/ui/search/instant_extended_browsertest.cc',
+        'browser/ui/search/instant_extended_manual_browsertest.cc',
+        'browser/ui/search/instant_test_utils.h',
+        'browser/ui/search/instant_test_utils.cc',
         'browser/ui/startup/startup_browser_creator_interactive_uitest.cc',
         'browser/ui/views/ash/tab_scrubber_browsertest.cc',
         'browser/ui/views/bookmarks/bookmark_bar_view_test.cc',