diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc
index 6053ffb7c321d1..0c4e6bca7f2d14 100644
--- a/chrome/browser/automation/testing_automation_provider.cc
+++ b/chrome/browser/automation/testing_automation_provider.cc
@@ -56,7 +56,6 @@
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
-#include "chrome/browser/search_engines/keyword_editor_controller.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/tab_contents/infobar_delegate.h"
@@ -68,6 +67,7 @@
 #include "chrome/browser/ui/find_bar/find_bar.h"
 #include "chrome/browser/ui/login/login_prompt.h"
 #include "chrome/browser/ui/omnibox/location_bar.h"
+#include "chrome/browser/ui/search_engines/keyword_editor_controller.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index a03452fdb2165c..490d4c743d20f6 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -41,7 +41,6 @@
 #include "chrome/browser/renderer_host/browser_render_process_host.h"
 #include "chrome/browser/renderer_host/web_cache_manager.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
-#include "chrome/browser/search_engines/keyword_editor_controller.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"
 #include "chrome/browser/ssl/ssl_manager.h"
@@ -50,6 +49,7 @@
 #include "chrome/browser/task_manager/task_manager.h"
 #include "chrome/browser/translate/translate_prefs.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/search_engines/keyword_editor_controller.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/upgrade_detector.h"
 #include "chrome/browser/webui/flags_ui.h"
diff --git a/chrome/browser/ui/cocoa/options/edit_search_engine_cocoa_controller.h b/chrome/browser/ui/cocoa/options/edit_search_engine_cocoa_controller.h
index 9db2a4ee6c63f9..c4ebb007e6369c 100644
--- a/chrome/browser/ui/cocoa/options/edit_search_engine_cocoa_controller.h
+++ b/chrome/browser/ui/cocoa/options/edit_search_engine_cocoa_controller.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -9,7 +9,7 @@ class TemplateURL;
 #import "base/mac/cocoa_protocols.h"
 #include "base/scoped_nsobject.h"
 #include "base/scoped_ptr.h"
-#include "chrome/browser/search_engines/edit_search_engine_controller.h"
+#include "chrome/browser/ui/search_engines/edit_search_engine_controller.h"
 
 // This controller presents a dialog that allows a user to add or edit a search
 // engine. If constructed with a nil |templateURL| then it is an add operation,
diff --git a/chrome/browser/ui/cocoa/options/keyword_editor_cocoa_controller.h b/chrome/browser/ui/cocoa/options/keyword_editor_cocoa_controller.h
index 7a9d5198e3a999..f9a949b8501bd3 100644
--- a/chrome/browser/ui/cocoa/options/keyword_editor_cocoa_controller.h
+++ b/chrome/browser/ui/cocoa/options/keyword_editor_cocoa_controller.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -7,10 +7,10 @@
 #import "base/mac/cocoa_protocols.h"
 #include "base/scoped_ptr.h"
 #include "base/string16.h"
-#include "chrome/browser/search_engines/edit_search_engine_controller.h"
-#include "chrome/browser/search_engines/keyword_editor_controller.h"
 #include "chrome/browser/search_engines/template_url_model_observer.h"
 #include "chrome/browser/ui/cocoa/table_row_nsimage_cache.h"
+#include "chrome/browser/ui/search_engines/edit_search_engine_controller.h"
+#include "chrome/browser/ui/search_engines/keyword_editor_controller.h"
 #include "ui/base/models/table_model_observer.h"
 
 class EditSearchEngineControllerDelegate;
diff --git a/chrome/browser/ui/cocoa/options/keyword_editor_cocoa_controller.mm b/chrome/browser/ui/cocoa/options/keyword_editor_cocoa_controller.mm
index 119a69de2bd4ce..3c29a29293f776 100644
--- a/chrome/browser/ui/cocoa/options/keyword_editor_cocoa_controller.mm
+++ b/chrome/browser/ui/cocoa/options/keyword_editor_cocoa_controller.mm
@@ -13,9 +13,9 @@
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url_model.h"
-#include "chrome/browser/search_engines/template_url_table_model.h"
 #import "chrome/browser/ui/cocoa/options/edit_search_engine_cocoa_controller.h"
 #import "chrome/browser/ui/cocoa/window_size_autosaver.h"
+#include "chrome/browser/ui/search_engines/template_url_table_model.h"
 #include "chrome/common/pref_names.h"
 #include "grit/generated_resources.h"
 #include "skia/ext/skia_utils_mac.h"
diff --git a/chrome/browser/ui/gtk/edit_search_engine_dialog.cc b/chrome/browser/ui/gtk/edit_search_engine_dialog.cc
index b7a7d8f97baacb..96f321b9b0df72 100644
--- a/chrome/browser/ui/gtk/edit_search_engine_dialog.cc
+++ b/chrome/browser/ui/gtk/edit_search_engine_dialog.cc
@@ -11,11 +11,11 @@
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/search_engines/edit_search_engine_controller.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/ui/gtk/accessible_widget_helper_gtk.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
+#include "chrome/browser/ui/search_engines/edit_search_engine_controller.h"
 #include "googleurl/src/gurl.h"
 #include "grit/app_resources.h"
 #include "grit/generated_resources.h"
diff --git a/chrome/browser/ui/gtk/keyword_editor_view.cc b/chrome/browser/ui/gtk/keyword_editor_view.cc
index 608f9c7abe4736..85f365c8c1080c 100644
--- a/chrome/browser/ui/gtk/keyword_editor_view.cc
+++ b/chrome/browser/ui/gtk/keyword_editor_view.cc
@@ -10,14 +10,14 @@
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/search_engines/keyword_editor_controller.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_model.h"
-#include "chrome/browser/search_engines/template_url_table_model.h"
 #include "chrome/browser/ui/gtk/accessible_widget_helper_gtk.h"
 #include "chrome/browser/ui/gtk/edit_search_engine_dialog.h"
 #include "chrome/browser/ui/gtk/gtk_tree.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
+#include "chrome/browser/ui/search_engines/keyword_editor_controller.h"
+#include "chrome/browser/ui/search_engines/template_url_table_model.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "third_party/skia/include/core/SkBitmap.h"
diff --git a/chrome/browser/ui/gtk/keyword_editor_view.h b/chrome/browser/ui/gtk/keyword_editor_view.h
index 9a08c6766ca58b..27f9d0f319cc8e 100644
--- a/chrome/browser/ui/gtk/keyword_editor_view.h
+++ b/chrome/browser/ui/gtk/keyword_editor_view.h
@@ -12,8 +12,8 @@
 #include "base/gtest_prod_util.h"
 #include "base/scoped_ptr.h"
 #include "base/string16.h"
-#include "chrome/browser/search_engines/edit_search_engine_controller.h"
 #include "chrome/browser/search_engines/template_url_model_observer.h"
+#include "chrome/browser/ui/search_engines/edit_search_engine_controller.h"
 #include "ui/base/models/table_model_observer.h"
 
 class AccessibleWidgetHelper;
diff --git a/chrome/browser/ui/gtk/keyword_editor_view_unittest.cc b/chrome/browser/ui/gtk/keyword_editor_view_unittest.cc
index 330634a8a1d3b3..fa88efd97ad01b 100644
--- a/chrome/browser/ui/gtk/keyword_editor_view_unittest.cc
+++ b/chrome/browser/ui/gtk/keyword_editor_view_unittest.cc
@@ -14,8 +14,8 @@
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_model.h"
-#include "chrome/browser/search_engines/template_url_table_model.h"
 #include "chrome/browser/ui/gtk/gtk_tree.h"
+#include "chrome/browser/ui/search_engines/template_url_table_model.h"
 #include "chrome/test/testing_profile.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/chrome/browser/search_engines/edit_search_engine_controller.cc b/chrome/browser/ui/search_engines/edit_search_engine_controller.cc
similarity index 98%
rename from chrome/browser/search_engines/edit_search_engine_controller.cc
rename to chrome/browser/ui/search_engines/edit_search_engine_controller.cc
index 10c02ef9a72762..bd397f28f5cfda 100644
--- a/chrome/browser/search_engines/edit_search_engine_controller.cc
+++ b/chrome/browser/ui/search_engines/edit_search_engine_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/search_engines/edit_search_engine_controller.h"
+#include "chrome/browser/ui/search_engines/edit_search_engine_controller.h"
 
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
diff --git a/chrome/browser/search_engines/edit_search_engine_controller.h b/chrome/browser/ui/search_engines/edit_search_engine_controller.h
similarity index 92%
rename from chrome/browser/search_engines/edit_search_engine_controller.h
rename to chrome/browser/ui/search_engines/edit_search_engine_controller.h
index 2d5f534c306a4d..5d57c1d78c129c 100644
--- a/chrome/browser/search_engines/edit_search_engine_controller.h
+++ b/chrome/browser/ui/search_engines/edit_search_engine_controller.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_SEARCH_ENGINES_EDIT_SEARCH_ENGINE_CONTROLLER_H_
-#define CHROME_BROWSER_SEARCH_ENGINES_EDIT_SEARCH_ENGINE_CONTROLLER_H_
+#ifndef CHROME_BROWSER_UI_SEARCH_ENGINES_EDIT_SEARCH_ENGINE_CONTROLLER_H_
+#define CHROME_BROWSER_UI_SEARCH_ENGINES_EDIT_SEARCH_ENGINE_CONTROLLER_H_
 #pragma once
 
 #include <string>
@@ -88,4 +88,4 @@ class EditSearchEngineController {
   DISALLOW_COPY_AND_ASSIGN(EditSearchEngineController);
 };
 
-#endif  // CHROME_BROWSER_SEARCH_ENGINES_EDIT_SEARCH_ENGINE_CONTROLLER_H_
+#endif  // CHROME_BROWSER_UI_SEARCH_ENGINES_EDIT_SEARCH_ENGINE_CONTROLLER_H_
diff --git a/chrome/browser/search_engines/keyword_editor_controller.cc b/chrome/browser/ui/search_engines/keyword_editor_controller.cc
similarity index 96%
rename from chrome/browser/search_engines/keyword_editor_controller.cc
rename to chrome/browser/ui/search_engines/keyword_editor_controller.cc
index 349d469cdbe100..0c98b0f6ea0afa 100644
--- a/chrome/browser/search_engines/keyword_editor_controller.cc
+++ b/chrome/browser/ui/search_engines/keyword_editor_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/search_engines/keyword_editor_controller.h"
+#include "chrome/browser/ui/search_engines/keyword_editor_controller.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/metrics/user_metrics.h"
@@ -10,7 +10,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_model.h"
-#include "chrome/browser/search_engines/template_url_table_model.h"
+#include "chrome/browser/ui/search_engines/template_url_table_model.h"
 #include "chrome/common/pref_names.h"
 
 KeywordEditorController::KeywordEditorController(Profile* profile)
diff --git a/chrome/browser/search_engines/keyword_editor_controller.h b/chrome/browser/ui/search_engines/keyword_editor_controller.h
similarity index 89%
rename from chrome/browser/search_engines/keyword_editor_controller.h
rename to chrome/browser/ui/search_engines/keyword_editor_controller.h
index a1642e4cf56f86..6b8ff743a130aa 100644
--- a/chrome/browser/search_engines/keyword_editor_controller.h
+++ b/chrome/browser/ui/search_engines/keyword_editor_controller.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_SEARCH_ENGINES_KEYWORD_EDITOR_CONTROLLER_H_
-#define CHROME_BROWSER_SEARCH_ENGINES_KEYWORD_EDITOR_CONTROLLER_H_
+#ifndef CHROME_BROWSER_UI_SEARCH_ENGINES_KEYWORD_EDITOR_CONTROLLER_H_
+#define CHROME_BROWSER_UI_SEARCH_ENGINES_KEYWORD_EDITOR_CONTROLLER_H_
 #pragma once
 
 #include <string>
@@ -77,4 +77,4 @@ class KeywordEditorController {
   DISALLOW_COPY_AND_ASSIGN(KeywordEditorController);
 };
 
-#endif  // CHROME_BROWSER_SEARCH_ENGINES_KEYWORD_EDITOR_CONTROLLER_H_
+#endif  // CHROME_BROWSER_UI_SEARCH_ENGINES_KEYWORD_EDITOR_CONTROLLER_H_
diff --git a/chrome/browser/search_engines/keyword_editor_controller_unittest.cc b/chrome/browser/ui/search_engines/keyword_editor_controller_unittest.cc
similarity index 98%
rename from chrome/browser/search_engines/keyword_editor_controller_unittest.cc
rename to chrome/browser/ui/search_engines/keyword_editor_controller_unittest.cc
index 9ea48ac8b1c974..72b5bc1938438c 100644
--- a/chrome/browser/search_engines/keyword_editor_controller_unittest.cc
+++ b/chrome/browser/ui/search_engines/keyword_editor_controller_unittest.cc
@@ -5,10 +5,10 @@
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/search_engines/keyword_editor_controller.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_model.h"
-#include "chrome/browser/search_engines/template_url_table_model.h"
+#include "chrome/browser/ui/search_engines/keyword_editor_controller.h"
+#include "chrome/browser/ui/search_engines/template_url_table_model.h"
 #include "chrome/common/notification_details.h"
 #include "chrome/common/notification_source.h"
 #include "chrome/common/pref_names.h"
diff --git a/chrome/browser/search_engines/template_url_table_model.cc b/chrome/browser/ui/search_engines/template_url_table_model.cc
similarity index 99%
rename from chrome/browser/search_engines/template_url_table_model.cc
rename to chrome/browser/ui/search_engines/template_url_table_model.cc
index 3d342f72994f3d..6c82c853686938 100644
--- a/chrome/browser/search_engines/template_url_table_model.cc
+++ b/chrome/browser/ui/search_engines/template_url_table_model.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/search_engines/template_url_table_model.h"
+#include "chrome/browser/ui/search_engines/template_url_table_model.h"
 
 #include "base/callback.h"
 #include "base/i18n/rtl.h"
diff --git a/chrome/browser/search_engines/template_url_table_model.h b/chrome/browser/ui/search_engines/template_url_table_model.h
similarity index 93%
rename from chrome/browser/search_engines/template_url_table_model.h
rename to chrome/browser/ui/search_engines/template_url_table_model.h
index 7a0d42b4701181..c002908f98c132 100644
--- a/chrome/browser/search_engines/template_url_table_model.h
+++ b/chrome/browser/ui/search_engines/template_url_table_model.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_TABLE_MODEL_H_
-#define CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_TABLE_MODEL_H_
+#ifndef CHROME_BROWSER_UI_SEARCH_ENGINES_TEMPLATE_URL_TABLE_MODEL_H_
+#define CHROME_BROWSER_UI_SEARCH_ENGINES_TEMPLATE_URL_TABLE_MODEL_H_
 #pragma once
 
 #include <string>
@@ -114,4 +114,4 @@ class TemplateURLTableModel : public ui::TableModel,
 };
 
 
-#endif  // CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_TABLE_MODEL_H_
+#endif  // CHROME_BROWSER_UI_SEARCH_ENGINES_TEMPLATE_URL_TABLE_MODEL_H_
diff --git a/chrome/browser/ui/views/edit_search_engine_dialog.cc b/chrome/browser/ui/views/edit_search_engine_dialog.cc
index e7f48f24e44e65..5bae7f16a14d99 100644
--- a/chrome/browser/ui/views/edit_search_engine_dialog.cc
+++ b/chrome/browser/ui/views/edit_search_engine_dialog.cc
@@ -7,8 +7,8 @@
 #include "base/i18n/rtl.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/search_engines/edit_search_engine_controller.h"
 #include "chrome/browser/search_engines/template_url.h"
+#include "chrome/browser/ui/search_engines/edit_search_engine_controller.h"
 #include "googleurl/src/gurl.h"
 #include "grit/app_resources.h"
 #include "grit/generated_resources.h"
diff --git a/chrome/browser/ui/views/keyword_editor_view.cc b/chrome/browser/ui/views/keyword_editor_view.cc
index 090e5a4392703f..38e0deec04ab99 100644
--- a/chrome/browser/ui/views/keyword_editor_view.cc
+++ b/chrome/browser/ui/views/keyword_editor_view.cc
@@ -13,7 +13,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_model.h"
-#include "chrome/browser/search_engines/template_url_table_model.h"
+#include "chrome/browser/ui/search_engines/template_url_table_model.h"
 #include "chrome/browser/ui/views/browser_dialogs.h"
 #include "chrome/browser/ui/views/first_run_search_engine_view.h"
 #include "chrome/common/pref_names.h"
diff --git a/chrome/browser/ui/views/keyword_editor_view.h b/chrome/browser/ui/views/keyword_editor_view.h
index 972073075911fd..746119e087a351 100644
--- a/chrome/browser/ui/views/keyword_editor_view.h
+++ b/chrome/browser/ui/views/keyword_editor_view.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -9,9 +9,9 @@
 #include <Windows.h>
 
 #include "base/string16.h"
-#include "chrome/browser/search_engines/edit_search_engine_controller.h"
-#include "chrome/browser/search_engines/keyword_editor_controller.h"
 #include "chrome/browser/search_engines/template_url_model_observer.h"
+#include "chrome/browser/ui/search_engines/edit_search_engine_controller.h"
+#include "chrome/browser/ui/search_engines/keyword_editor_controller.h"
 #include "views/controls/button/button.h"
 #include "views/controls/table/table_view_observer.h"
 #include "views/view.h"
diff --git a/chrome/browser/webui/options/search_engine_manager_handler.cc b/chrome/browser/webui/options/search_engine_manager_handler.cc
index 712f2a8cafa70d..53c8d04fd3d042 100644
--- a/chrome/browser/webui/options/search_engine_manager_handler.cc
+++ b/chrome/browser/webui/options/search_engine_manager_handler.cc
@@ -9,10 +9,10 @@
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/search_engines/keyword_editor_controller.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_model.h"
-#include "chrome/browser/search_engines/template_url_table_model.h"
+#include "chrome/browser/ui/search_engines/keyword_editor_controller.h"
+#include "chrome/browser/ui/search_engines/template_url_table_model.h"
 #include "chrome/common/url_constants.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
diff --git a/chrome/browser/webui/options/search_engine_manager_handler.h b/chrome/browser/webui/options/search_engine_manager_handler.h
index b7e94302f2dc46..537f836596418c 100644
--- a/chrome/browser/webui/options/search_engine_manager_handler.h
+++ b/chrome/browser/webui/options/search_engine_manager_handler.h
@@ -5,7 +5,7 @@
 #ifndef CHROME_BROWSER_WEBUI_OPTIONS_SEARCH_ENGINE_MANAGER_HANDLER_H_
 #define CHROME_BROWSER_WEBUI_OPTIONS_SEARCH_ENGINE_MANAGER_HANDLER_H_
 
-#include "chrome/browser/search_engines/edit_search_engine_controller.h"
+#include "chrome/browser/ui/search_engines/edit_search_engine_controller.h"
 #include "chrome/browser/webui/options/options_ui.h"
 #include "ui/base/models/table_model_observer.h"
 
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index ac188c6036902c..d7d8a194c3f6f3 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -1830,10 +1830,6 @@
         'browser/safe_browsing/safe_browsing_store_file.h',
         'browser/safe_browsing/safe_browsing_util.cc',
         'browser/safe_browsing/safe_browsing_util.h',
-        'browser/search_engines/edit_search_engine_controller.cc',
-        'browser/search_engines/edit_search_engine_controller.h',
-        'browser/search_engines/keyword_editor_controller.cc',
-        'browser/search_engines/keyword_editor_controller.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',
@@ -1856,8 +1852,6 @@
         'browser/search_engines/template_url_parser.h',
         'browser/search_engines/template_url_prepopulate_data.cc',
         'browser/search_engines/template_url_prepopulate_data.h',
-        'browser/search_engines/template_url_table_model.cc',
-        'browser/search_engines/template_url_table_model.h',
         'browser/search_engines/util.cc',
         'browser/search_engines/util.h',
         'browser/service/service_process_control.cc',
@@ -2876,12 +2870,18 @@
         'browser/ui/options/options_window.h',
         'browser/ui/options/show_options_url.cc',
         'browser/ui/options/show_options_url.h',
+        'browser/ui/search_engines/edit_search_engine_controller.cc',
+        'browser/ui/search_engines/edit_search_engine_controller.h',
+        'browser/ui/search_engines/keyword_editor_controller.cc',
+        'browser/ui/search_engines/keyword_editor_controller.h',
         'browser/ui/search_engines/search_engine_tab_helper.cc',
         'browser/ui/search_engines/search_engine_tab_helper.h',
         'browser/ui/search_engines/search_engine_tab_helper_delegate.cc',
         'browser/ui/search_engines/search_engine_tab_helper_delegate.h',
         'browser/ui/search_engines/template_url_fetcher_ui_callbacks.cc',
         'browser/ui/search_engines/template_url_fetcher_ui_callbacks.h',
+        'browser/ui/search_engines/template_url_table_model.cc',
+        'browser/ui/search_engines/template_url_table_model.h',
         'browser/ui/shell_dialogs.cc',
         'browser/ui/shell_dialogs.h',
         'browser/ui/status_bubble.h',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index fbdbf3af5fce16..b9b8c445514cec 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1467,7 +1467,6 @@
         'browser/safe_browsing/safe_browsing_store_unittest.cc',
         'browser/safe_browsing/safe_browsing_store_unittest_helper.cc',
         'browser/safe_browsing/safe_browsing_util_unittest.cc',
-        'browser/search_engines/keyword_editor_controller_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',
@@ -1711,6 +1710,7 @@
         'browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm',
         'browser/ui/find_bar/find_backend_unittest.cc',
         'browser/ui/login/login_prompt_unittest.cc',
+        'browser/ui/search_engines/keyword_editor_controller_unittest.cc',
         'browser/ui/tabs/dock_info_unittest.cc',
         'browser/ui/tabs/tab_menu_model_unittest.cc',
         'browser/ui/tests/ui_gfx_image_unittest.cc',