diff options
66 files changed, 114 insertions, 114 deletions
diff --git a/chrome/browser/autocomplete/history_quick_provider.cc b/chrome/browser/autocomplete/history_quick_provider.cc index 0011fd4..20db550 100644 --- a/chrome/browser/autocomplete/history_quick_provider.cc +++ b/chrome/browser/autocomplete/history_quick_provider.cc @@ -25,10 +25,10 @@ #include "chrome/browser/history/in_memory_url_index.h" #include "chrome/browser/history/in_memory_url_index_types.h" #include "chrome/browser/history/scored_history_match.h" -#include "chrome/browser/instant/search.h" #include "chrome/browser/net/url_fixer_upper.h" #include "chrome/browser/omnibox/omnibox_field_trial.h" #include "chrome/browser/profiles/profile.h" +#include "chrome/browser/search/search.h" #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" diff --git a/chrome/browser/autocomplete/search_provider.cc b/chrome/browser/autocomplete/search_provider.cc index d6a4880..d5a5945 100644 --- a/chrome/browser/autocomplete/search_provider.cc +++ b/chrome/browser/autocomplete/search_provider.cc @@ -29,11 +29,11 @@ #include "chrome/browser/history/history_service.h" #include "chrome/browser/history/history_service_factory.h" #include "chrome/browser/history/in_memory_database.h" -#include "chrome/browser/instant/search.h" #include "chrome/browser/metrics/variations/variations_http_header_provider.h" #include "chrome/browser/net/url_fixer_upper.h" #include "chrome/browser/omnibox/omnibox_field_trial.h" #include "chrome/browser/profiles/profile.h" +#include "chrome/browser/search/search.h" #include "chrome/browser/search_engines/search_engine_type.h" #include "chrome/browser/search_engines/template_url_prepopulate_data.h" #include "chrome/browser/search_engines/template_url_service.h" diff --git a/chrome/browser/autocomplete/search_provider_unittest.cc b/chrome/browser/autocomplete/search_provider_unittest.cc index 909e43bf6..88db2fe 100644 --- a/chrome/browser/autocomplete/search_provider_unittest.cc +++ b/chrome/browser/autocomplete/search_provider_unittest.cc @@ -20,8 +20,8 @@ #include "chrome/browser/autocomplete/history_url_provider.h" #include "chrome/browser/history/history_service.h" #include "chrome/browser/history/history_service_factory.h" -#include "chrome/browser/instant/search.h" #include "chrome/browser/omnibox/omnibox_field_trial.h" +#include "chrome/browser/search/search.h" #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc index f3a3a3e..0b5e807 100644 --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc @@ -41,9 +41,6 @@ #include "chrome/browser/extensions/suggest_permission_util.h" #include "chrome/browser/geolocation/chrome_access_token_store.h" #include "chrome/browser/google/google_util.h" -#include "chrome/browser/instant/instant_service.h" -#include "chrome/browser/instant/instant_service_factory.h" -#include "chrome/browser/instant/search.h" #include "chrome/browser/media/media_capture_devices_dispatcher.h" #include "chrome/browser/nacl_host/nacl_process_host.h" #include "chrome/browser/net/chrome_net_log.h" @@ -63,6 +60,9 @@ #include "chrome/browser/renderer_host/chrome_render_message_filter.h" #include "chrome/browser/renderer_host/chrome_render_view_host_observer.h" #include "chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.h" +#include "chrome/browser/search/instant_service.h" +#include "chrome/browser/search/instant_service_factory.h" +#include "chrome/browser/search/search.h" #include "chrome/browser/search_engines/search_provider_install_state_message_filter.h" #include "chrome/browser/signin/signin_manager.h" #include "chrome/browser/signin/signin_manager_factory.h" diff --git a/chrome/browser/favicon/DEPS b/chrome/browser/favicon/DEPS index a5fd7b5..1c9912b 100644 --- a/chrome/browser/favicon/DEPS +++ b/chrome/browser/favicon/DEPS @@ -9,7 +9,7 @@ # Permanently-allowed DEPS beyond the standard Browser # Components-like DEPS above go here. - "+chrome/browser/instant/search.h", + "+chrome/browser/search/search.h", "+third_party/skia/include/core/SkBitmap.h", # TODO(caitkp): Bring this list to zero. diff --git a/chrome/browser/favicon/favicon_tab_helper.cc b/chrome/browser/favicon/favicon_tab_helper.cc index 6a9a00c..9163926 100644 --- a/chrome/browser/favicon/favicon_tab_helper.cc +++ b/chrome/browser/favicon/favicon_tab_helper.cc @@ -9,8 +9,8 @@ #include "chrome/browser/favicon/favicon_util.h" #include "chrome/browser/history/history_service.h" #include "chrome/browser/history/history_service_factory.h" -#include "chrome/browser/instant/search.h" #include "chrome/browser/profiles/profile.h" +#include "chrome/browser/search/search.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_notification_types.h" #include "content/public/browser/favicon_status.h" diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc index cb26e9b..8aad6b1 100644 --- a/chrome/browser/policy/policy_browsertest.cc +++ b/chrome/browser/policy/policy_browsertest.cc @@ -31,9 +31,6 @@ #include "chrome/browser/extensions/crx_installer.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" -#include "chrome/browser/instant/instant_service.h" -#include "chrome/browser/instant/instant_service_factory.h" -#include "chrome/browser/instant/search.h" #include "chrome/browser/media/media_capture_devices_dispatcher.h" #include "chrome/browser/media/media_stream_devices_controller.h" #include "chrome/browser/net/url_request_mock_util.h" @@ -43,6 +40,9 @@ #include "chrome/browser/policy/policy_map.h" #include "chrome/browser/prefs/session_startup_pref.h" #include "chrome/browser/profiles/profile.h" +#include "chrome/browser/search/instant_service.h" +#include "chrome/browser/search/instant_service_factory.h" +#include "chrome/browser/search/search.h" #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc index 97348eb..731a9a3 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc @@ -33,7 +33,6 @@ #include "chrome/browser/google/google_url_tracker_factory.h" #include "chrome/browser/gpu/gl_string_manager.h" #include "chrome/browser/gpu/gpu_mode_manager.h" -#include "chrome/browser/instant/search.h" #include "chrome/browser/intranet_redirect_detector.h" #include "chrome/browser/io_thread.h" #include "chrome/browser/managed_mode/managed_mode.h" @@ -63,6 +62,7 @@ #include "chrome/browser/profiles/profile_info_cache.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/renderer_host/web_cache_manager.h" +#include "chrome/browser/search/search.h" #include "chrome/browser/search_engines/template_url_prepopulate_data.h" #include "chrome/browser/signin/signin_manager_factory.h" #include "chrome/browser/sync/invalidations/invalidator_storage.h" diff --git a/chrome/browser/instant/OWNERS b/chrome/browser/search/OWNERS index 8514380..8514380 100644 --- a/chrome/browser/instant/OWNERS +++ b/chrome/browser/search/OWNERS diff --git a/chrome/browser/instant/instant_io_context.cc b/chrome/browser/search/instant_io_context.cc index e2199d6..ad813ea 100644 --- a/chrome/browser/instant/instant_io_context.cc +++ b/chrome/browser/search/instant_io_context.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_io_context.h" +#include "chrome/browser/search/instant_io_context.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/resource_context.h" diff --git a/chrome/browser/instant/instant_io_context.h b/chrome/browser/search/instant_io_context.h index 99b805c..c9357b6 100644 --- a/chrome/browser/instant/instant_io_context.h +++ b/chrome/browser/search/instant_io_context.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_IO_CONTEXT_ -#define CHROME_BROWSER_INSTANT_INSTANT_IO_CONTEXT_ +#ifndef CHROME_BROWSER_SEARCH_INSTANT_IO_CONTEXT_H_ +#define CHROME_BROWSER_SEARCH_INSTANT_IO_CONTEXT_H_ #include <map> #include <set> @@ -97,4 +97,4 @@ class InstantIOContext : public base::RefCountedThreadSafe<InstantIOContext> { DISALLOW_COPY_AND_ASSIGN(InstantIOContext); }; -#endif // CHROME_BROWSER_INSTANT_INSTANT_IO_CONTEXT_ +#endif // CHROME_BROWSER_SEARCH_INSTANT_IO_CONTEXT_H_ diff --git a/chrome/browser/instant/instant_service.cc b/chrome/browser/search/instant_service.cc index e94639e..00e34b5 100644 --- a/chrome/browser/instant/instant_service.cc +++ b/chrome/browser/search/instant_service.cc @@ -2,14 +2,14 @@ // 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_service.h" +#include "chrome/browser/search/instant_service.h" #include "base/strings/string_number_conversions.h" #include "chrome/browser/history/history_notifications.h" -#include "chrome/browser/instant/instant_io_context.h" -#include "chrome/browser/instant/instant_service_factory.h" -#include "chrome/browser/instant/local_omnibox_popup_source.h" #include "chrome/browser/profiles/profile.h" +#include "chrome/browser/search/instant_io_context.h" +#include "chrome/browser/search/instant_service_factory.h" +#include "chrome/browser/search/local_omnibox_popup_source.h" #include "chrome/browser/ui/webui/favicon_source.h" #include "chrome/browser/ui/webui/ntp/thumbnail_source.h" #include "chrome/browser/ui/webui/theme_source.h" diff --git a/chrome/browser/instant/instant_service.h b/chrome/browser/search/instant_service.h index bdb8a35..d1c84ca 100644 --- a/chrome/browser/instant/instant_service.h +++ b/chrome/browser/search/instant_service.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_SERVICE_H_ -#define CHROME_BROWSER_INSTANT_INSTANT_SERVICE_H_ +#ifndef CHROME_BROWSER_SEARCH_INSTANT_SERVICE_H_ +#define CHROME_BROWSER_SEARCH_INSTANT_SERVICE_H_ #include <map> #include <set> @@ -101,4 +101,4 @@ class InstantService : public ProfileKeyedService, DISALLOW_COPY_AND_ASSIGN(InstantService); }; -#endif // CHROME_BROWSER_INSTANT_INSTANT_SERVICE_H_ +#endif // CHROME_BROWSER_SEARCH_INSTANT_SERVICE_H_ diff --git a/chrome/browser/instant/instant_service_factory.cc b/chrome/browser/search/instant_service_factory.cc index 585e0c2..ebb68a9 100644 --- a/chrome/browser/instant/instant_service_factory.cc +++ b/chrome/browser/search/instant_service_factory.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_service_factory.h" +#include "chrome/browser/search/instant_service_factory.h" -#include "chrome/browser/instant/instant_service.h" #include "chrome/browser/profiles/profile_dependency_manager.h" +#include "chrome/browser/search/instant_service.h" // static InstantService* InstantServiceFactory::GetForProfile(Profile* profile) { diff --git a/chrome/browser/instant/instant_service_factory.h b/chrome/browser/search/instant_service_factory.h index 80e26ab..ad02cdf 100644 --- a/chrome/browser/instant/instant_service_factory.h +++ b/chrome/browser/search/instant_service_factory.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_SERVICE_FACTORY_H_ -#define CHROME_BROWSER_INSTANT_INSTANT_SERVICE_FACTORY_H_ +#ifndef CHROME_BROWSER_SEARCH_INSTANT_SERVICE_FACTORY_H_ +#define CHROME_BROWSER_SEARCH_INSTANT_SERVICE_FACTORY_H_ #include "base/basictypes.h" #include "base/compiler_specific.h" @@ -36,4 +36,4 @@ class InstantServiceFactory : public ProfileKeyedServiceFactory { DISALLOW_COPY_AND_ASSIGN(InstantServiceFactory); }; -#endif // CHROME_BROWSER_INSTANT_INSTANT_SERVICE_FACTORY_H_ +#endif // CHROME_BROWSER_SEARCH_INSTANT_SERVICE_FACTORY_H_ diff --git a/chrome/browser/instant/local_omnibox_popup_source.cc b/chrome/browser/search/local_omnibox_popup_source.cc index 1b64fe9..a11a2d8 100644 --- a/chrome/browser/instant/local_omnibox_popup_source.cc +++ b/chrome/browser/search/local_omnibox_popup_source.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/local_omnibox_popup_source.h" +#include "chrome/browser/search/local_omnibox_popup_source.h" #include "base/logging.h" #include "base/memory/ref_counted_memory.h" diff --git a/chrome/browser/instant/local_omnibox_popup_source.h b/chrome/browser/search/local_omnibox_popup_source.h index fb40fcd..a85d2e4 100644 --- a/chrome/browser/instant/local_omnibox_popup_source.h +++ b/chrome/browser/search/local_omnibox_popup_source.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_LOCAL_OMNIBOX_POPUP_SOURCE_H_ -#define CHROME_BROWSER_INSTANT_LOCAL_OMNIBOX_POPUP_SOURCE_H_ +#ifndef CHROME_BROWSER_SEARCH_LOCAL_OMNIBOX_POPUP_SOURCE_H_ +#define CHROME_BROWSER_SEARCH_LOCAL_OMNIBOX_POPUP_SOURCE_H_ #include "base/basictypes.h" #include "base/compiler_specific.h" @@ -31,4 +31,4 @@ class LocalOmniboxPopupSource : public content::URLDataSource { DISALLOW_COPY_AND_ASSIGN(LocalOmniboxPopupSource); }; -#endif // CHROME_BROWSER_INSTANT_LOCAL_OMNIBOX_POPUP_SOURCE_H_ +#endif // CHROME_BROWSER_SEARCH_LOCAL_OMNIBOX_POPUP_SOURCE_H_ diff --git a/chrome/browser/instant/search.cc b/chrome/browser/search/search.cc index 25adc19..4385336 100644 --- a/chrome/browser/instant/search.cc +++ b/chrome/browser/search/search.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/search.h" +#include "chrome/browser/search/search.h" #include "base/command_line.h" #include "base/metrics/field_trial.h" @@ -10,9 +10,9 @@ #include "base/prefs/pref_service.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" -#include "chrome/browser/instant/instant_service.h" -#include "chrome/browser/instant/instant_service_factory.h" #include "chrome/browser/profiles/profile.h" +#include "chrome/browser/search/instant_service.h" +#include "chrome/browser/search/instant_service_factory.h" #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/browser/instant/search.h b/chrome/browser/search/search.h index a25b819..4c2cbf2 100644 --- a/chrome/browser/instant/search.h +++ b/chrome/browser/search/search.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_SEARCH_H_ -#define CHROME_BROWSER_INSTANT_SEARCH_H_ +#ifndef CHROME_BROWSER_SEARCH_SEARCH_H_ +#define CHROME_BROWSER_SEARCH_SEARCH_H_ #include <string> #include <utility> @@ -156,4 +156,4 @@ GURL CoerceCommandLineURLToTemplateURL(const GURL& instant_url, } // namespace search } // namespace chrome -#endif // CHROME_BROWSER_INSTANT_SEARCH_H_ +#endif // CHROME_BROWSER_SEARCH_SEARCH_H_ diff --git a/chrome/browser/instant/search_unittest.cc b/chrome/browser/search/search_unittest.cc index 46fecea..6fb827b 100644 --- a/chrome/browser/instant/search_unittest.cc +++ b/chrome/browser/search/search_unittest.cc @@ -4,7 +4,7 @@ #include "base/command_line.h" #include "base/prefs/pref_service.h" -#include "chrome/browser/instant/search.h" +#include "chrome/browser/search/search.h" #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" diff --git a/chrome/browser/search_engines/search_terms_data.cc b/chrome/browser/search_engines/search_terms_data.cc index df6e67b..8588ac4 100644 --- a/chrome/browser/search_engines/search_terms_data.cc +++ b/chrome/browser/search_engines/search_terms_data.cc @@ -10,8 +10,8 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/google/google_url_tracker.h" #include "chrome/browser/google/google_util.h" -#include "chrome/browser/instant/search.h" #include "chrome/browser/profiles/profile.h" +#include "chrome/browser/search/search.h" #include "content/public/browser/browser_thread.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/sessions/session_types.cc b/chrome/browser/sessions/session_types.cc index 145390b..ee781be 100644 --- a/chrome/browser/sessions/session_types.cc +++ b/chrome/browser/sessions/session_types.cc @@ -9,7 +9,7 @@ #include "base/stl_util.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/instant/search.h" +#include "chrome/browser/search/search.h" #include "chrome/browser/sessions/session_command.h" #include "chrome/browser/ui/browser.h" #include "content/public/browser/favicon_status.h" diff --git a/chrome/browser/sessions/session_types_unittest.cc b/chrome/browser/sessions/session_types_unittest.cc index 5051bf5..254b3a2e 100644 --- a/chrome/browser/sessions/session_types_unittest.cc +++ b/chrome/browser/sessions/session_types_unittest.cc @@ -12,7 +12,7 @@ #include "base/strings/string_number_conversions.h" #include "base/time.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/instant/search.h" +#include "chrome/browser/search/search.h" #include "chrome/browser/sessions/session_types.h" #include "chrome/browser/sessions/session_types_test_helper.h" #include "content/public/browser/favicon_status.h" diff --git a/chrome/browser/ui/bookmarks/bookmark_context_menu_controller.cc b/chrome/browser/ui/bookmarks/bookmark_context_menu_controller.cc index 0d36f17..9fa8749 100644 --- a/chrome/browser/ui/bookmarks/bookmark_context_menu_controller.cc +++ b/chrome/browser/ui/bookmarks/bookmark_context_menu_controller.cc @@ -11,9 +11,9 @@ #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/bookmarks/bookmark_utils.h" -#include "chrome/browser/instant/search.h" #include "chrome/browser/prefs/incognito_mode_prefs.h" #include "chrome/browser/profiles/profile.h" +#include "chrome/browser/search/search.h" #include "chrome/browser/ui/bookmarks/bookmark_utils.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/chrome_pages.h" diff --git a/chrome/browser/ui/bookmarks/bookmark_tab_helper.cc b/chrome/browser/ui/bookmarks/bookmark_tab_helper.cc index e94e6b2..6dc385c 100644 --- a/chrome/browser/ui/bookmarks/bookmark_tab_helper.cc +++ b/chrome/browser/ui/bookmarks/bookmark_tab_helper.cc @@ -7,9 +7,9 @@ #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/defaults.h" -#include "chrome/browser/instant/search.h" #include "chrome/browser/prefs/pref_service_syncable.h" #include "chrome/browser/profiles/profile.h" +#include "chrome/browser/search/search.h" #include "chrome/browser/ui/bookmarks/bookmark_tab_helper_delegate.h" #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/ui/bookmarks/bookmark_unittest.cc b/chrome/browser/ui/bookmarks/bookmark_unittest.cc index 139fc55..d54287a 100644 --- a/chrome/browser/ui/bookmarks/bookmark_unittest.cc +++ b/chrome/browser/ui/bookmarks/bookmark_unittest.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/search.h" +#include "chrome/browser/search/search.h" #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc index d3ab36a..c34edf9 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc @@ -59,7 +59,6 @@ #include "chrome/browser/file_select_helper.h" #include "chrome/browser/first_run/first_run.h" #include "chrome/browser/google/google_url_tracker.h" -#include "chrome/browser/instant/search.h" #include "chrome/browser/lifetime/application_lifetime.h" #include "chrome/browser/net/url_fixer_upper.h" #include "chrome/browser/notifications/notification_ui_manager.h" @@ -71,6 +70,7 @@ #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/profiles/profile_metrics.h" #include "chrome/browser/repost_form_warning_controller.h" +#include "chrome/browser/search/search.h" #include "chrome/browser/sessions/session_service.h" #include "chrome/browser/sessions/session_service_factory.h" #include "chrome/browser/sessions/session_tab_helper.h" diff --git a/chrome/browser/ui/browser_instant_controller.cc b/chrome/browser/ui/browser_instant_controller.cc index 5ffb7f0..ca47c0f 100644 --- a/chrome/browser/ui/browser_instant_controller.cc +++ b/chrome/browser/ui/browser_instant_controller.cc @@ -7,8 +7,8 @@ #include "base/prefs/pref_service.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_web_ui.h" -#include "chrome/browser/instant/search.h" #include "chrome/browser/profiles/profile.h" +#include "chrome/browser/search/search.h" #include "chrome/browser/themes/theme_properties.h" #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/themes/theme_service_factory.h" diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm index 4464d66..46bfa53 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm @@ -14,9 +14,9 @@ #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/instant/search.h" #include "chrome/browser/prefs/incognito_mode_prefs.h" #include "chrome/browser/profiles/profile.h" +#include "chrome/browser/search/search.h" #include "chrome/browser/themes/theme_properties.h" #include "chrome/browser/themes/theme_service.h" #import "chrome/browser/themes/theme_service_factory.h" diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view.mm index f5d6e21..06552cd 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view.mm @@ -4,7 +4,7 @@ #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view.h" -#include "chrome/browser/instant/search.h" +#include "chrome/browser/search/search.h" #include "chrome/browser/themes/theme_properties.h" #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_constants.h" #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h" diff --git a/chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm b/chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm index 708ecc4..bd8f66b 100644 --- a/chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm +++ b/chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm @@ -10,15 +10,15 @@ #include "chrome/browser/api/infobars/confirm_infobar_delegate.h" #include "chrome/browser/api/infobars/infobar_service.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/instant/search.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" +#include "chrome/browser/search/search.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/browser_window.h" +#import "chrome/browser/ui/cocoa/browser/avatar_button_controller.h" #include "chrome/browser/ui/cocoa/browser_window_cocoa.h" #import "chrome/browser/ui/cocoa/browser_window_controller_private.h" -#import "chrome/browser/ui/cocoa/browser/avatar_button_controller.h" #import "chrome/browser/ui/cocoa/fast_resize_view.h" #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h" #import "chrome/browser/ui/cocoa/nsview_additions.h" diff --git a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm index eae9c69..fcb2806 100644 --- a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm +++ b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm @@ -9,7 +9,7 @@ #include "base/stl_util.h" #include "base/sys_string_conversions.h" #include "chrome/browser/autocomplete/autocomplete_match.h" -#include "chrome/browser/instant/search.h" +#include "chrome/browser/search/search.h" #include "chrome/browser/ui/cocoa/event_utils.h" #include "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h" #include "chrome/browser/ui/omnibox/omnibox_edit_model.h" diff --git a/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm b/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm index a939fec..d6efa6d 100644 --- a/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm +++ b/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm @@ -13,8 +13,8 @@ #include "chrome/browser/autocomplete/autocomplete_input.h" #include "chrome/browser/autocomplete/autocomplete_match.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/instant/search.h" #include "chrome/browser/profiles/profile.h" +#include "chrome/browser/search/search.h" #include "chrome/browser/ui/cocoa/event_utils.h" #include "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.h" #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.h" diff --git a/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac_unittest.mm b/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac_unittest.mm index 4c31fb6..238d6e2 100644 --- a/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac_unittest.mm +++ b/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac_unittest.mm @@ -4,7 +4,7 @@ #import "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h" -#include "chrome/browser/instant/search.h" +#include "chrome/browser/search/search.h" #include "chrome/browser/ui/cocoa/cocoa_profile_test.h" #include "chrome/browser/ui/omnibox/omnibox_edit_controller.h" #include "chrome/browser/ui/omnibox/omnibox_popup_model.h" diff --git a/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm b/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm index 3c27b71..1924e91 100644 --- a/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm @@ -6,22 +6,22 @@ #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" -#include "chrome/browser/instant/search.h" +#include "chrome/browser/search/search.h" #include "chrome/browser/sync/glue/session_model_associator.h" #include "chrome/browser/sync/profile_sync_service_factory.h" #include "chrome/browser/ui/cocoa/cocoa_profile_test.h" -#import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" #include "chrome/browser/ui/cocoa/run_loop_testing.h" +#import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" #import "chrome/browser/ui/cocoa/view_resizer_pong.h" #import "chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.h" -#include "chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h" #include "chrome/browser/ui/toolbar/recent_tabs_builder_test_helper.h" +#include "chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h" #include "chrome/browser/ui/toolbar/wrench_menu_model.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest_mac.h" #include "testing/gtest/include/gtest/gtest.h" +#include "testing/gtest_mac.h" #include "testing/platform_test.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.cc b/chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.cc index 01d828c..e3cffad 100644 --- a/chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.cc +++ b/chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.cc @@ -19,9 +19,9 @@ #include "chrome/browser/bookmarks/bookmark_node_data.h" #include "chrome/browser/command_updater.h" #include "chrome/browser/defaults.h" -#include "chrome/browser/instant/search.h" #include "chrome/browser/platform_util.h" #include "chrome/browser/profiles/profile.h" +#include "chrome/browser/search/search.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/gtk/gtk_theme_service.h" #include "chrome/browser/ui/gtk/gtk_util.h" diff --git a/chrome/browser/ui/omnibox/omnibox_edit_model.cc b/chrome/browser/ui/omnibox/omnibox_edit_model.cc index 4446e70..a5dd85c 100644 --- a/chrome/browser/ui/omnibox/omnibox_edit_model.cc +++ b/chrome/browser/ui/omnibox/omnibox_edit_model.cc @@ -27,7 +27,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/search.h" #include "chrome/browser/net/predictor.h" #include "chrome/browser/net/url_fixer_upper.h" #include "chrome/browser/predictors/autocomplete_action_predictor.h" @@ -36,6 +35,7 @@ #include "chrome/browser/prerender/prerender_manager.h" #include "chrome/browser/prerender/prerender_manager_factory.h" #include "chrome/browser/profiles/profile.h" +#include "chrome/browser/search/search.h" #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_prepopulate_data.h" #include "chrome/browser/search_engines/template_url_service.h" diff --git a/chrome/browser/ui/search/instant_browsertest.cc b/chrome/browser/ui/search/instant_browsertest.cc index 74b4947..43fdb0e 100644 --- a/chrome/browser/ui/search/instant_browsertest.cc +++ b/chrome/browser/ui/search/instant_browsertest.cc @@ -4,9 +4,9 @@ #include "chrome/browser/content_settings/host_content_settings_map.h" #include "chrome/browser/history/history_service_factory.h" -#include "chrome/browser/instant/instant_service.h" -#include "chrome/browser/instant/instant_service_factory.h" #include "chrome/browser/profiles/profile.h" +#include "chrome/browser/search/instant_service.h" +#include "chrome/browser/search/instant_service_factory.h" #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/task_manager/task_manager.h" diff --git a/chrome/browser/ui/search/instant_controller.cc b/chrome/browser/ui/search/instant_controller.cc index 783c628..c9759763 100644 --- a/chrome/browser/ui/search/instant_controller.cc +++ b/chrome/browser/ui/search/instant_controller.cc @@ -13,10 +13,10 @@ #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_service.h" -#include "chrome/browser/instant/instant_service_factory.h" -#include "chrome/browser/instant/search.h" #include "chrome/browser/platform_util.h" +#include "chrome/browser/search/instant_service.h" +#include "chrome/browser/search/instant_service_factory.h" +#include "chrome/browser/search/search.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" diff --git a/chrome/browser/ui/search/instant_extended_browsertest.cc b/chrome/browser/ui/search/instant_extended_browsertest.cc index d3935ae..d0cca0e 100644 --- a/chrome/browser/ui/search/instant_extended_browsertest.cc +++ b/chrome/browser/ui/search/instant_extended_browsertest.cc @@ -16,10 +16,10 @@ #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_service.h" -#include "chrome/browser/instant/instant_service_factory.h" -#include "chrome/browser/instant/search.h" #include "chrome/browser/profiles/profile.h" +#include "chrome/browser/search/instant_service.h" +#include "chrome/browser/search/instant_service_factory.h" +#include "chrome/browser/search/search.h" #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/themes/theme_service_factory.h" #include "chrome/browser/ui/omnibox/omnibox_view.h" diff --git a/chrome/browser/ui/search/instant_extended_manual_browsertest.cc b/chrome/browser/ui/search/instant_extended_manual_browsertest.cc index 332d311..c0e277d 100644 --- a/chrome/browser/ui/search/instant_extended_manual_browsertest.cc +++ b/chrome/browser/ui/search/instant_extended_manual_browsertest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/string_util.h" -#include "chrome/browser/instant/search.h" +#include "chrome/browser/search/search.h" #include "chrome/browser/task_manager/task_manager.h" #include "chrome/browser/task_manager/task_manager_browsertest_util.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/browser/ui/search/instant_overlay.cc b/chrome/browser/ui/search/instant_overlay.cc index c056e38..352bfbc 100644 --- a/chrome/browser/ui/search/instant_overlay.cc +++ b/chrome/browser/ui/search/instant_overlay.cc @@ -6,7 +6,7 @@ #include "base/auto_reset.h" #include "base/supports_user_data.h" -#include "chrome/browser/instant/search.h" +#include "chrome/browser/search/search.h" #include "chrome/common/url_constants.h" #include "content/public/browser/web_contents.h" diff --git a/chrome/browser/ui/search/search_delegate_unittest.cc b/chrome/browser/ui/search/search_delegate_unittest.cc index 4e4354c..777fa6b 100644 --- a/chrome/browser/ui/search/search_delegate_unittest.cc +++ b/chrome/browser/ui/search/search_delegate_unittest.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/search.h" +#include "chrome/browser/search/search.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/search/search_model.h" #include "chrome/browser/ui/search/search_tab_helper.h" diff --git a/chrome/browser/ui/search/search_model.cc b/chrome/browser/ui/search/search_model.cc index 74232f3..b1830e6 100644 --- a/chrome/browser/ui/search/search_model.cc +++ b/chrome/browser/ui/search/search_model.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ui/search/search_model.h" -#include "chrome/browser/instant/search.h" +#include "chrome/browser/search/search.h" #include "chrome/browser/ui/search/search_model_observer.h" namespace chrome { diff --git a/chrome/browser/ui/search/search_tab_helper.cc b/chrome/browser/ui/search/search_tab_helper.cc index c65d13d..cece414 100644 --- a/chrome/browser/ui/search/search_tab_helper.cc +++ b/chrome/browser/ui/search/search_tab_helper.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ui/search/search_tab_helper.h" -#include "chrome/browser/instant/search.h" +#include "chrome/browser/search/search.h" #include "chrome/common/url_constants.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/notification_service.h" diff --git a/chrome/browser/ui/toolbar/toolbar_model_impl.cc b/chrome/browser/ui/toolbar/toolbar_model_impl.cc index c6b64f1..7b7d930 100644 --- a/chrome/browser/ui/toolbar/toolbar_model_impl.cc +++ b/chrome/browser/ui/toolbar/toolbar_model_impl.cc @@ -11,8 +11,8 @@ #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h" #include "chrome/browser/autocomplete/autocomplete_input.h" #include "chrome/browser/autocomplete/autocomplete_match.h" -#include "chrome/browser/instant/search.h" #include "chrome/browser/profiles/profile.h" +#include "chrome/browser/search/search.h" #include "chrome/browser/ssl/ssl_error_info.h" #include "chrome/browser/ui/toolbar/toolbar_model_delegate.h" #include "chrome/common/chrome_constants.h" diff --git a/chrome/browser/ui/toolbar/toolbar_model_unittest.cc b/chrome/browser/ui/toolbar/toolbar_model_unittest.cc index 8afdd5f..e130ebc 100644 --- a/chrome/browser/ui/toolbar/toolbar_model_unittest.cc +++ b/chrome/browser/ui/toolbar/toolbar_model_unittest.cc @@ -9,9 +9,9 @@ #include "base/command_line.h" #include "base/utf_string_conversions.h" #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h" -#include "chrome/browser/instant/instant_service.h" -#include "chrome/browser/instant/instant_service_factory.h" -#include "chrome/browser/instant/search.h" +#include "chrome/browser/search/instant_service.h" +#include "chrome/browser/search/instant_service_factory.h" +#include "chrome/browser/search/search.h" #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" diff --git a/chrome/browser/ui/toolbar/wrench_menu_model.cc b/chrome/browser/ui/toolbar/wrench_menu_model.cc index d2f1efe..37f0f5c 100644 --- a/chrome/browser/ui/toolbar/wrench_menu_model.cc +++ b/chrome/browser/ui/toolbar/wrench_menu_model.cc @@ -16,9 +16,9 @@ #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/defaults.h" -#include "chrome/browser/instant/search.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" +#include "chrome/browser/search/search.h" #include "chrome/browser/signin/signin_manager.h" #include "chrome/browser/signin/signin_manager_factory.h" #include "chrome/browser/signin/signin_ui_util.h" diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc index ba42b02..046eb55 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc @@ -21,8 +21,8 @@ #include "chrome/browser/browser_shutdown.h" #include "chrome/browser/defaults.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/instant/search.h" #include "chrome/browser/profiles/profile.h" +#include "chrome/browser/search/search.h" #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/sync/profile_sync_service_factory.h" #include "chrome/browser/themes/theme_properties.h" diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_unittest.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_unittest.cc index a22620e..58f14ea 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_unittest.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_unittest.cc @@ -5,8 +5,8 @@ #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h" #include "base/prefs/pref_service.h" -#include "chrome/browser/instant/search.h" #include "chrome/browser/profiles/profile.h" +#include "chrome/browser/search/search.h" #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views.cc b/chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views.cc index b0ac763..d35e7a9 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views.cc @@ -11,9 +11,9 @@ #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/bookmarks/bookmark_utils.h" -#include "chrome/browser/instant/search.h" #include "chrome/browser/prefs/incognito_mode_prefs.h" #include "chrome/browser/profiles/profile.h" +#include "chrome/browser/search/search.h" #include "chrome/browser/ui/bookmarks/bookmark_utils.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/chrome_pages.h" diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc index bda1018..cb7eb97 100644 --- a/chrome/browser/ui/views/frame/browser_view.cc +++ b/chrome/browser/ui/views/frame/browser_view.cc @@ -20,7 +20,6 @@ #include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/tab_helper.h" -#include "chrome/browser/instant/search.h" #include "chrome/browser/managed_mode/managed_mode.h" #include "chrome/browser/native_window_notification_source.h" #include "chrome/browser/password_manager/password_manager.h" @@ -28,6 +27,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_info_cache.h" #include "chrome/browser/profiles/profile_manager.h" +#include "chrome/browser/search/search.h" #include "chrome/browser/sessions/tab_restore_service.h" #include "chrome/browser/sessions/tab_restore_service_factory.h" #include "chrome/browser/speech/tts_controller.h" diff --git a/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc b/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc index 99a77fc..cfca04c 100644 --- a/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc +++ b/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.h" -#include "chrome/browser/instant/search.h" +#include "chrome/browser/search/search.h" #include "chrome/browser/ui/omnibox/omnibox_popup_non_view.h" #include "chrome/browser/ui/omnibox/omnibox_view.h" #include "chrome/browser/ui/views/location_bar/location_bar_view.h" diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc index 95d90f3..ef77a34 100644 --- a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc +++ b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc @@ -13,8 +13,8 @@ #include "chrome/browser/bookmarks/bookmark_node_data.h" #include "chrome/browser/chromeos/input_method/input_method_configuration.h" #include "chrome/browser/command_updater.h" -#include "chrome/browser/instant/search.h" #include "chrome/browser/profiles/profile.h" +#include "chrome/browser/search/search.h" #include "chrome/browser/ui/omnibox/omnibox_edit_controller.h" #include "chrome/browser/ui/omnibox/omnibox_edit_model.h" #include "chrome/browser/ui/omnibox/omnibox_popup_model.h" diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_win.cc b/chrome/browser/ui/views/omnibox/omnibox_view_win.cc index 3af8e99..fbdfd75 100644 --- a/chrome/browser/ui/views/omnibox/omnibox_view_win.cc +++ b/chrome/browser/ui/views/omnibox/omnibox_view_win.cc @@ -30,9 +30,9 @@ #include "chrome/browser/autocomplete/keyword_provider.h" #include "chrome/browser/bookmarks/bookmark_node_data.h" #include "chrome/browser/command_updater.h" -#include "chrome/browser/instant/search.h" #include "chrome/browser/net/url_fixer_upper.h" #include "chrome/browser/profiles/profile.h" +#include "chrome/browser/search/search.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/omnibox/omnibox_edit_controller.h" #include "chrome/browser/ui/omnibox/omnibox_edit_model.h" diff --git a/chrome/browser/ui/views/reload_button.cc b/chrome/browser/ui/views/reload_button.cc index 6340886..f538a03 100644 --- a/chrome/browser/ui/views/reload_button.cc +++ b/chrome/browser/ui/views/reload_button.cc @@ -7,7 +7,7 @@ #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/command_updater.h" -#include "chrome/browser/instant/search.h" +#include "chrome/browser/search/search.h" #include "chrome/browser/ui/search/search_model.h" #include "chrome/browser/ui/views/location_bar/location_bar_view.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/views/wrench_menu.cc b/chrome/browser/ui/views/wrench_menu.cc index fce9d43..7edbf9a 100644 --- a/chrome/browser/ui/views/wrench_menu.cc +++ b/chrome/browser/ui/views/wrench_menu.cc @@ -13,8 +13,8 @@ #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" -#include "chrome/browser/instant/search.h" #include "chrome/browser/profiles/profile.h" +#include "chrome/browser/search/search.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" diff --git a/chrome/browser/ui/webui/favicon_source.cc b/chrome/browser/ui/webui/favicon_source.cc index 7414c43..6864120 100644 --- a/chrome/browser/ui/webui/favicon_source.cc +++ b/chrome/browser/ui/webui/favicon_source.cc @@ -9,10 +9,10 @@ #include "base/strings/string_number_conversions.h" #include "chrome/browser/favicon/favicon_service_factory.h" #include "chrome/browser/history/top_sites.h" -#include "chrome/browser/instant/instant_io_context.h" -#include "chrome/browser/instant/instant_service.h" -#include "chrome/browser/instant/instant_service_factory.h" #include "chrome/browser/profiles/profile.h" +#include "chrome/browser/search/instant_io_context.h" +#include "chrome/browser/search/instant_service.h" +#include "chrome/browser/search/instant_service_factory.h" #include "chrome/common/url_constants.h" #include "grit/locale_settings.h" #include "grit/ui_resources.h" diff --git a/chrome/browser/ui/webui/history_ui.cc b/chrome/browser/ui/webui/history_ui.cc index b07e178..fc18eba 100644 --- a/chrome/browser/ui/webui/history_ui.cc +++ b/chrome/browser/ui/webui/history_ui.cc @@ -28,11 +28,11 @@ #include "chrome/browser/history/history_types.h" #include "chrome/browser/history/web_history_service.h" #include "chrome/browser/history/web_history_service_factory.h" -#include "chrome/browser/instant/search.h" #include "chrome/browser/managed_mode/managed_mode_url_filter.h" #include "chrome/browser/managed_mode/managed_user_service.h" #include "chrome/browser/managed_mode/managed_user_service_factory.h" #include "chrome/browser/profiles/profile.h" +#include "chrome/browser/search/search.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/chrome_pages.h" #include "chrome/browser/ui/webui/favicon_source.h" diff --git a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc index 40dacf1..35c8db4 100644 --- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc +++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc @@ -20,9 +20,9 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/first_run/first_run.h" #include "chrome/browser/google/google_util.h" -#include "chrome/browser/instant/search.h" #include "chrome/browser/policy/browser_policy_connector.h" #include "chrome/browser/profiles/profile.h" +#include "chrome/browser/search/search.h" #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/sync/profile_sync_service_factory.h" #include "chrome/browser/themes/theme_properties.h" diff --git a/chrome/browser/ui/webui/ntp/thumbnail_source.cc b/chrome/browser/ui/webui/ntp/thumbnail_source.cc index 0848da3..ac6bcbe62f 100644 --- a/chrome/browser/ui/webui/ntp/thumbnail_source.cc +++ b/chrome/browser/ui/webui/ntp/thumbnail_source.cc @@ -5,14 +5,14 @@ #include "chrome/browser/ui/webui/ntp/thumbnail_source.h" #include "base/callback.h" -#include "base/message_loop.h" #include "base/memory/ref_counted_memory.h" -#include "chrome/browser/instant/instant_io_context.h" -#include "chrome/browser/instant/instant_service.h" -#include "chrome/browser/instant/instant_service_factory.h" +#include "base/message_loop.h" +#include "chrome/browser/profiles/profile.h" +#include "chrome/browser/search/instant_io_context.h" +#include "chrome/browser/search/instant_service.h" +#include "chrome/browser/search/instant_service_factory.h" #include "chrome/browser/thumbnails/thumbnail_service.h" #include "chrome/browser/thumbnails/thumbnail_service_factory.h" -#include "chrome/browser/profiles/profile.h" #include "chrome/common/url_constants.h" #include "googleurl/src/gurl.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/ui/webui/omnibox/omnibox_ui_handler.cc b/chrome/browser/ui/webui/omnibox/omnibox_ui_handler.cc index c81a0e2..7c43efb 100644 --- a/chrome/browser/ui/webui/omnibox/omnibox_ui_handler.cc +++ b/chrome/browser/ui/webui/omnibox/omnibox_ui_handler.cc @@ -17,7 +17,7 @@ #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/search.h" #include "chrome/browser/search_engines/template_url.h" #include "content/public/browser/web_ui.h" diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc index d645c77..1e30e74 100644 --- a/chrome/browser/ui/webui/options/browser_options_handler.cc +++ b/chrome/browser/ui/webui/options/browser_options_handler.cc @@ -24,7 +24,6 @@ #include "chrome/browser/chrome_page_zoom.h" #include "chrome/browser/custom_home_pages_table_model.h" #include "chrome/browser/download/download_prefs.h" -#include "chrome/browser/instant/search.h" #include "chrome/browser/net/url_fixer_upper.h" #include "chrome/browser/prefs/session_startup_pref.h" #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h" @@ -35,6 +34,7 @@ #include "chrome/browser/profiles/profile_info_util.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/profiles/profile_shortcut_manager.h" +#include "chrome/browser/search/search.h" #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" diff --git a/chrome/browser/ui/webui/theme_source.cc b/chrome/browser/ui/webui/theme_source.cc index 53eeba7..6061c9c 100644 --- a/chrome/browser/ui/webui/theme_source.cc +++ b/chrome/browser/ui/webui/theme_source.cc @@ -7,9 +7,9 @@ #include "base/memory/ref_counted_memory.h" #include "base/message_loop.h" #include "base/strings/string_number_conversions.h" -#include "chrome/browser/instant/instant_io_context.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/resources_util.h" +#include "chrome/browser/search/instant_io_context.h" #include "chrome/browser/themes/theme_properties.h" #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/themes/theme_service_factory.h" diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 803f2b2..85b6ca1 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -851,16 +851,6 @@ 'browser/infobars/infobar_tab_helper.h', 'browser/infobars/insecure_content_infobar_delegate.cc', 'browser/infobars/insecure_content_infobar_delegate.h', - 'browser/instant/instant_io_context.cc', - 'browser/instant/instant_io_context.h', - 'browser/instant/instant_service.cc', - 'browser/instant/instant_service.h', - 'browser/instant/instant_service_factory.cc', - 'browser/instant/instant_service_factory.h', - 'browser/instant/local_omnibox_popup_source.cc', - 'browser/instant/local_omnibox_popup_source.h', - 'browser/instant/search.cc', - 'browser/instant/search.h', 'browser/internal_auth.cc', 'browser/internal_auth.h', 'browser/intranet_redirect_detector.cc', @@ -1621,6 +1611,16 @@ 'browser/safe_browsing/ui_manager.h', 'browser/screensaver_window_finder_gtk.cc', 'browser/screensaver_window_finder_gtk.h', + 'browser/search/instant_io_context.cc', + 'browser/search/instant_io_context.h', + 'browser/search/instant_service.cc', + 'browser/search/instant_service.h', + 'browser/search/instant_service_factory.cc', + 'browser/search/instant_service_factory.h', + 'browser/search/local_omnibox_popup_source.cc', + 'browser/search/local_omnibox_popup_source.h', + 'browser/search/search.cc', + 'browser/search/search.h', 'browser/search_engines/search_engine_type.h', 'browser/search_engines/search_host_to_urls_map.cc', 'browser/search_engines/search_host_to_urls_map.h', @@ -1628,10 +1628,10 @@ 'browser/search_engines/search_provider_install_data.h', 'browser/search_engines/search_provider_install_state_message_filter.cc', 'browser/search_engines/search_provider_install_state_message_filter.h', - 'browser/search_engines/search_terms_data_android.cc', - 'browser/search_engines/search_terms_data_android.h', 'browser/search_engines/search_terms_data.cc', 'browser/search_engines/search_terms_data.h', + 'browser/search_engines/search_terms_data_android.cc', + 'browser/search_engines/search_terms_data_android.h', 'browser/search_engines/template_url.cc', 'browser/search_engines/template_url.h', 'browser/search_engines/template_url_fetcher.cc', diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi index 4e862e5..c0589a9 100644 --- a/chrome/chrome_tests_unit.gypi +++ b/chrome/chrome_tests_unit.gypi @@ -857,7 +857,6 @@ 'browser/importer/importer_unittest_utils.h', 'browser/importer/safari_importer_unittest.mm', 'browser/importer/toolbar_importer_unittest.cc', - 'browser/instant/search_unittest.cc', 'browser/internal_auth_unittest.cc', 'browser/language_usage_metrics_unittest.cc', 'browser/mac/keystone_glue_unittest.mm', @@ -1037,6 +1036,7 @@ 'browser/safe_browsing/safe_browsing_util_unittest.cc', 'browser/safe_browsing/signature_util_win_unittest.cc', 'browser/safe_browsing/two_phase_uploader_unittest.cc', + 'browser/search/search_unittest.cc', 'browser/search_engines/search_host_to_urls_map_unittest.cc', 'browser/search_engines/search_provider_install_data_unittest.cc', 'browser/search_engines/template_url_fetcher_unittest.cc', @@ -2170,11 +2170,11 @@ 'browser/browser_commands_unittest.cc', 'browser/download/download_shelf_unittest.cc', - 'browser/instant/search_unittest.cc', 'browser/managed_mode/managed_user_passphrase_unittest.cc', 'browser/net/gaia/gaia_oauth_fetcher_unittest.cc', 'browser/page_cycler/page_cycler_unittest.cc', 'browser/profiles/off_the_record_profile_impl_unittest.cc', + 'browser/search/search_unittest.cc', 'browser/sync/profile_sync_service_session_unittest.cc', 'browser/sync/sync_global_error_unittest.cc', 'browser/tab_contents/render_view_context_menu_unittest.cc', |