WebUI: Move chrome/browser/dom_ui/ to chrome/browser/webui/.

To reduce the size of this change I've left stub header files in chrome/browser/dom_ui/.

I'll updated the references and delete the stub files later.

BUG=59945, 59946
TEST=trybots

Review URL: http://codereview.chromium.org/6538075

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

85 files changed, 227 insertions, 227 deletions

diff --git a/chrome/browser/automation/automation_provider_observers.cc b/chrome/browser/automation/automation_provider_observers.cc
index 366530d..479a9ab 100644
--- a/chrome/browser/automation/automation_provider_observers.cc
+++ b/chrome/browser/automation/automation_provider_observers.cc
@@ -25,8 +25,6 @@
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/dom_operation_notification_details.h"
-#include "chrome/browser/dom_ui/most_visited_handler.h"
-#include "chrome/browser/dom_ui/new_tab_ui.h"
 #include "chrome/browser/download/download_item.h"
 #include "chrome/browser/download/save_package.h"
 #include "chrome/browser/extensions/extension_host.h"
@@ -35,8 +33,8 @@
 #include "chrome/browser/history/top_sites.h"
 #include "chrome/browser/metrics/metric_event_duration_details.h"
 #include "chrome/browser/notifications/balloon.h"
-#include "chrome/browser/notifications/balloon_host.h"
 #include "chrome/browser/notifications/balloon_collection.h"
+#include "chrome/browser/notifications/balloon_host.h"
 #include "chrome/browser/notifications/notification.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
 #include "chrome/browser/printing/print_job.h"
@@ -54,6 +52,8 @@
 #include "chrome/browser/ui/find_bar/find_notification_details.h"
 #include "chrome/browser/ui/login/login_prompt.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/browser/webui/most_visited_handler.h"
+#include "chrome/browser/webui/new_tab_ui.h"
 #include "chrome/common/automation_messages.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/notification_service.h"
diff --git a/chrome/browser/chromeos/webui/network_menu_ui.cc b/chrome/browser/chromeos/webui/network_menu_ui.cc
index 446ab24..5b642a9 100644
--- a/chrome/browser/chromeos/webui/network_menu_ui.cc
+++ b/chrome/browser/chromeos/webui/network_menu_ui.cc
@@ -4,17 +4,17 @@
 
 #include "chrome/browser/chromeos/webui/network_menu_ui.h"
 
-#include "base/values.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
+#include "base/values.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/chromeos/status/network_menu.h"
 #include "chrome/browser/chromeos/views/native_menu_webui.h"
 #include "chrome/browser/chromeos/views/webui_menu_widget.h"
-#include "chrome/browser/dom_ui/web_ui_theme_source.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/browser/webui/web_ui_theme_source.h"
 #include "chrome/common/url_constants.h"
 #include "googleurl/src/gurl.h"
 #include "grit/browser_resources.h"
diff --git a/chrome/browser/extensions/extension_function_dispatcher.cc b/chrome/browser/extensions/extension_function_dispatcher.cc
index 4f69361..28305880 100644
--- a/chrome/browser/extensions/extension_function_dispatcher.cc
+++ b/chrome/browser/extensions/extension_function_dispatcher.cc
@@ -13,7 +13,6 @@
 #include "build/build_config.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_window.h"
-#include "chrome/browser/dom_ui/web_ui_favicon_source.h"
 #include "chrome/browser/extensions/execute_code_in_tab_function.h"
 #include "chrome/browser/extensions/extension_accessibility_api.h"
 #include "chrome/browser/extensions/extension_bookmark_manager_api.h"
@@ -52,6 +51,7 @@
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/webui/chrome_url_data_manager.h"
+#include "chrome/browser/webui/web_ui_favicon_source.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/render_messages_params.h"
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
index 7b3cba2..efceb54 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -22,10 +22,8 @@
 #include "base/values.h"
 #include "base/version.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/themes/browser_theme_provider.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/debugger/devtools_manager.h"
-#include "chrome/browser/dom_ui/shown_sections_handler.h"
 #include "chrome/browser/extensions/crx_installer.h"
 #include "chrome/browser/extensions/default_apps.h"
 #include "chrome/browser/extensions/extension_accessibility_api.h"
@@ -42,12 +40,14 @@
 #include "chrome/browser/extensions/extension_updater.h"
 #include "chrome/browser/extensions/extension_web_ui.h"
 #include "chrome/browser/extensions/extension_webnavigation_api.h"
-#include "chrome/browser/extensions/external_extension_provider_interface.h"
 #include "chrome/browser/extensions/external_extension_provider_impl.h"
+#include "chrome/browser/extensions/external_extension_provider_interface.h"
 #include "chrome/browser/net/chrome_url_request_context.h"
 #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/themes/browser_theme_provider.h"
+#include "chrome/browser/webui/shown_sections_handler.h"
 #include "chrome/common/child_process_logging.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
@@ -56,9 +56,9 @@
 #include "chrome/common/extensions/extension_file_util.h"
 #include "chrome/common/extensions/extension_l10n_util.h"
 #include "chrome/common/extensions/extension_resource.h"
+#include "chrome/common/json_value_serializer.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/notification_type.h"
-#include "chrome/common/json_value_serializer.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "googleurl/src/gurl.h"
diff --git a/chrome/browser/history/top_sites.cc b/chrome/browser/history/top_sites.cc
index 155c3fc..0bd30ff 100644
--- a/chrome/browser/history/top_sites.cc
+++ b/chrome/browser/history/top_sites.cc
@@ -14,7 +14,6 @@
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_thread.h"
-#include "chrome/browser/dom_ui/most_visited_handler.h"
 #include "chrome/browser/history/history_backend.h"
 #include "chrome/browser/history/history_notifications.h"
 #include "chrome/browser/history/page_usage_data.h"
@@ -24,6 +23,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
+#include "chrome/browser/webui/most_visited_handler.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
diff --git a/chrome/browser/history/top_sites_unittest.cc b/chrome/browser/history/top_sites_unittest.cc
index b380a57..be9ba74 100644
--- a/chrome/browser/history/top_sites_unittest.cc
+++ b/chrome/browser/history/top_sites_unittest.cc
@@ -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.
 
@@ -11,7 +11,6 @@
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_thread.h"
-#include "chrome/browser/dom_ui/most_visited_handler.h"
 #include "chrome/browser/history/history_backend.h"
 #include "chrome/browser/history/history_database.h"
 #include "chrome/browser/history/history_marshaling.h"
@@ -20,6 +19,7 @@
 #include "chrome/browser/history/top_sites_backend.h"
 #include "chrome/browser/history/top_sites_cache.h"
 #include "chrome/browser/history/top_sites_database.h"
+#include "chrome/browser/webui/most_visited_handler.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index a85e163..69ce0b2 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -13,7 +13,6 @@
 #include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/debugger/devtools_manager.h"
-#include "chrome/browser/dom_ui/new_tab_ui.h"
 #include "chrome/browser/download/download_prefs.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_web_ui.h"
@@ -52,6 +51,7 @@
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/upgrade_detector.h"
 #include "chrome/browser/webui/flags_ui.h"
+#include "chrome/browser/webui/new_tab_ui.h"
 #include "chrome/browser/webui/plugins_ui.h"
 #include "chrome/common/pref_names.h"
 
diff --git a/chrome/browser/printing/print_dialog_cloud_internal.h b/chrome/browser/printing/print_dialog_cloud_internal.h
index 91612ae..c5ab8b6 100644
--- a/chrome/browser/printing/print_dialog_cloud_internal.h
+++ b/chrome/browser/printing/print_dialog_cloud_internal.h
@@ -57,12 +57,12 @@ class CloudPrintDataSender
 
   // Calls to read in the PDF file (on the FILE thread) then send that
   // information to the dialog renderer (on the IO thread).  We know
-  // that the dom_ui pointer lifetime will outlast us, so we should be
+  // that the WebUI pointer lifetime will outlast us, so we should be
   // good.
   void ReadPrintDataFile(const FilePath& path_to_pdf);
   void SendPrintDataFile();
 
-  // Cancels any ramining part of the task by clearing out the dom_ui
+  // Cancels any ramining part of the task by clearing out the WebUI
   // helper_ ptr.
   void CancelPrintDataFile();
 
diff --git a/chrome/browser/printing/print_preview_message_handler.cc b/chrome/browser/printing/print_preview_message_handler.cc
index b6e96fc..7307750 100644
--- a/chrome/browser/printing/print_preview_message_handler.cc
+++ b/chrome/browser/printing/print_preview_message_handler.cc
@@ -6,14 +6,14 @@
 
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_thread.h"
-#include "chrome/browser/dom_ui/print_preview_handler.h"
-#include "chrome/browser/dom_ui/print_preview_ui.h"
-#include "chrome/browser/dom_ui/print_preview_ui_html_source.h"
-#include "chrome/browser/printing/printer_query.h"
 #include "chrome/browser/printing/print_job_manager.h"
 #include "chrome/browser/printing/print_preview_tab_controller.h"
+#include "chrome/browser/printing/printer_query.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/browser/webui/print_preview_handler.h"
+#include "chrome/browser/webui/print_preview_ui.h"
+#include "chrome/browser/webui/print_preview_ui_html_source.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/render_messages_params.h"
 #include "ipc/ipc_message_macros.h"
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
index 5c7e003e..42a2404 100644
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -27,7 +27,6 @@
 #include "chrome/browser/chrome_blob_storage_context.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/defaults.h"
-#include "chrome/browser/dom_ui/ntp_resource_cache.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/extensions/default_apps.h"
 #include "chrome/browser/extensions/extension_devtools_manager.h"
@@ -84,6 +83,7 @@
 #include "chrome/browser/web_resource/promo_resource_service.h"
 #include "chrome/browser/webdata/web_data_service.h"
 #include "chrome/browser/webui/chrome_url_data_manager.h"
+#include "chrome/browser/webui/ntp_resource_cache.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_paths_internal.h"
diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
index 701ca69..8faeb9d 100644
--- a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
@@ -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.
 //
@@ -16,7 +16,6 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/dom_operation_notification_details.h"
-#include "chrome/browser/dom_ui/new_tab_ui.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/prefs/pref_service.h"
@@ -25,8 +24,9 @@
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
-#include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/browser/tab_contents/tab_util.h"
+#include "chrome/browser/webui/new_tab_ui.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
diff --git a/chrome/browser/tabs/tab_strip_model_unittest.cc b/chrome/browser/tabs/tab_strip_model_unittest.cc
index 21ed2a5..f2762a8 100644
--- a/chrome/browser/tabs/tab_strip_model_unittest.cc
+++ b/chrome/browser/tabs/tab_strip_model_unittest.cc
@@ -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.
 
@@ -14,7 +14,6 @@
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/defaults.h"
-#include "chrome/browser/dom_ui/new_tab_ui.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/renderer_host/test/test_render_view_host.h"
@@ -26,6 +25,7 @@
 #include "chrome/browser/tabs/tab_strip_model_order_controller.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/browser/webui/new_tab_ui.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/notification_details.h"
 #include "chrome/common/notification_observer_mock.h"
diff --git a/chrome/browser/ui/views/options/general_page_view.cc b/chrome/browser/ui/views/options/general_page_view.cc
index b78f51a..ce3027b 100644
--- a/chrome/browser/ui/views/options/general_page_view.cc
+++ b/chrome/browser/ui/views/options/general_page_view.cc
@@ -12,16 +12,15 @@
 #include "base/string16.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/browser_window.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/browser_window.h"
 #include "chrome/browser/custom_home_pages_table_model.h"
-#include "chrome/browser/dom_ui/new_tab_ui.h"
 #include "chrome/browser/instant/instant_confirm_dialog.h"
 #include "chrome/browser/instant/instant_controller.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/prefs/pref_service.h"
-#include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/prefs/session_startup_pref.h"
+#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_model_observer.h"
@@ -29,6 +28,7 @@
 #include "chrome/browser/ui/views/keyword_editor_view.h"
 #include "chrome/browser/ui/views/options/managed_prefs_banner_view.h"
 #include "chrome/browser/ui/views/options/options_group_view.h"
+#include "chrome/browser/webui/new_tab_ui.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
diff --git a/chrome/browser/ui/views/textfield_views.cc b/chrome/browser/ui/views/textfield_views.cc
index cf57a0d..8e1268f 100644
--- a/chrome/browser/ui/views/textfield_views.cc
+++ b/chrome/browser/ui/views/textfield_views.cc
@@ -6,8 +6,8 @@
 
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
-#include "chrome/browser/dom_ui/textfields_ui.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/browser/webui/textfields_ui.h"
 
 TextfieldViews::TextfieldViews() : DOMView() {}
 
diff --git a/chrome/browser/dom_ui/OWNERS b/chrome/browser/webui/OWNERS
index 741a5c4..741a5c4 100644
--- a/chrome/browser/dom_ui/OWNERS
+++ b/chrome/browser/webui/OWNERS
diff --git a/chrome/browser/webui/app_launcher_handler.cc b/chrome/browser/webui/app_launcher_handler.cc
index 00ea365..fb92a6f 100644
--- a/chrome/browser/webui/app_launcher_handler.cc
+++ b/chrome/browser/webui/app_launcher_handler.cc
@@ -14,7 +14,6 @@
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/disposition_utils.h"
-#include "chrome/browser/dom_ui/shown_sections_handler.h"
 #include "chrome/browser/extensions/default_apps.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_service.h"
@@ -24,6 +23,7 @@
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
+#include "chrome/browser/webui/shown_sections_handler.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_icon_set.h"
diff --git a/chrome/browser/webui/bug_report_ui.cc b/chrome/browser/webui/bug_report_ui.cc
index 5918e4c..8be7e47 100644
--- a/chrome/browser/webui/bug_report_ui.cc
+++ b/chrome/browser/webui/bug_report_ui.cc
@@ -20,13 +20,13 @@
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/bug_report_data.h"
 #include "chrome/browser/bug_report_util.h"
-#include "chrome/browser/dom_ui/web_ui_screenshot_source.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/window_snapshot/window_snapshot.h"
+#include "chrome/browser/webui/web_ui_screenshot_source.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/url_constants.h"
diff --git a/chrome/browser/webui/chrome_url_data_manager_backend.cc b/chrome/browser/webui/chrome_url_data_manager_backend.cc
index e484a05..fab67db 100644
--- a/chrome/browser/webui/chrome_url_data_manager_backend.cc
+++ b/chrome/browser/webui/chrome_url_data_manager_backend.cc
@@ -11,10 +11,10 @@
 #include "base/string_util.h"
 #include "chrome/browser/appcache/view_appcache_internals_job_factory.h"
 #include "chrome/browser/browser_thread.h"
-#include "chrome/browser/dom_ui/shared_resources_data_source.h"
 #include "chrome/browser/net/chrome_url_request_context.h"
 #include "chrome/browser/net/view_blob_internals_job_factory.h"
 #include "chrome/browser/net/view_http_cache_job_factory.h"
+#include "chrome/browser/webui/shared_resources_data_source.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/url_constants.h"
 #include "googleurl/src/url_util.h"
diff --git a/chrome/browser/dom_ui/constrained_html_ui_browsertest.cc b/chrome/browser/webui/constrained_html_ui_browsertest.cc
index 6be6693..6be6693 100644
--- a/chrome/browser/dom_ui/constrained_html_ui_browsertest.cc
+++ b/chrome/browser/webui/constrained_html_ui_browsertest.cc
diff --git a/chrome/browser/dom_ui/file_browse_browsertest.cc b/chrome/browser/webui/file_browse_browsertest.cc
index a580844..a580844 100644
--- a/chrome/browser/dom_ui/file_browse_browsertest.cc
+++ b/chrome/browser/webui/file_browse_browsertest.cc
diff --git a/chrome/browser/webui/filebrowse_ui.cc b/chrome/browser/webui/filebrowse_ui.cc
index f2dcd46..10788fb 100644
--- a/chrome/browser/webui/filebrowse_ui.cc
+++ b/chrome/browser/webui/filebrowse_ui.cc
@@ -23,7 +23,6 @@
 #include "base/weak_ptr.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/browser_thread.h"
-#include "chrome/browser/dom_ui/web_ui_favicon_source.h"
 #include "chrome/browser/download/download_item.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/download/download_util.h"
@@ -37,6 +36,7 @@
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/webui/mediaplayer_ui.h"
+#include "chrome/browser/webui/web_ui_favicon_source.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/jstemplate_builder.h"
diff --git a/chrome/browser/webui/foreign_session_handler.cc b/chrome/browser/webui/foreign_session_handler.cc
index c8fac01..5c85433 100644
--- a/chrome/browser/webui/foreign_session_handler.cc
+++ b/chrome/browser/webui/foreign_session_handler.cc
@@ -11,7 +11,7 @@
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
-#include "chrome/browser/dom_ui/new_tab_ui.h"
+#include "chrome/browser/webui/new_tab_ui.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/session_restore.h"
 #include "chrome/browser/sync/engine/syncapi.h"
diff --git a/chrome/browser/webui/history2_ui.cc b/chrome/browser/webui/history2_ui.cc
index f6e17f3..bfb6974 100644
--- a/chrome/browser/webui/history2_ui.cc
+++ b/chrome/browser/webui/history2_ui.cc
@@ -20,7 +20,6 @@
 #include "base/values.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/browser_thread.h"
-#include "chrome/browser/dom_ui/web_ui_favicon_source.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/profiles/profile.h"
@@ -28,6 +27,7 @@
 #include "chrome/browser/tab_contents/tab_contents_delegate.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
+#include "chrome/browser/webui/web_ui_favicon_source.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/notification_source.h"
 #include "chrome/common/time_format.h"
diff --git a/chrome/browser/webui/history_ui.cc b/chrome/browser/webui/history_ui.cc
index 928fb80..4189a20 100644
--- a/chrome/browser/webui/history_ui.cc
+++ b/chrome/browser/webui/history_ui.cc
@@ -20,7 +20,6 @@
 #include "base/values.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/browser_thread.h"
-#include "chrome/browser/dom_ui/web_ui_favicon_source.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/profiles/profile.h"
@@ -28,6 +27,7 @@
 #include "chrome/browser/tab_contents/tab_contents_delegate.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
+#include "chrome/browser/webui/web_ui_favicon_source.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/notification_source.h"
 #include "chrome/common/time_format.h"
diff --git a/chrome/browser/dom_ui/html_dialog_tab_contents_delegate_unittest.cc b/chrome/browser/webui/html_dialog_tab_contents_delegate_unittest.cc
index 58da688..58da688 100644
--- a/chrome/browser/dom_ui/html_dialog_tab_contents_delegate_unittest.cc
+++ b/chrome/browser/webui/html_dialog_tab_contents_delegate_unittest.cc
diff --git a/chrome/browser/dom_ui/mediaplayer_browsertest.cc b/chrome/browser/webui/mediaplayer_browsertest.cc
index 17958e2..17958e2 100644
--- a/chrome/browser/dom_ui/mediaplayer_browsertest.cc
+++ b/chrome/browser/webui/mediaplayer_browsertest.cc
diff --git a/chrome/browser/webui/mediaplayer_ui.cc b/chrome/browser/webui/mediaplayer_ui.cc
index 34ca09f..44384bd 100644
--- a/chrome/browser/webui/mediaplayer_ui.cc
+++ b/chrome/browser/webui/mediaplayer_ui.cc
@@ -17,7 +17,6 @@
 #include "base/weak_ptr.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/browser_thread.h"
-#include "chrome/browser/dom_ui/web_ui_favicon_source.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/download/download_util.h"
 #include "chrome/browser/history/history_types.h"
@@ -28,6 +27,7 @@
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
+#include "chrome/browser/webui/web_ui_favicon_source.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/jstemplate_builder.h"
diff --git a/chrome/browser/dom_ui/most_visited_handler.cc b/chrome/browser/webui/most_visited_handler.cc
index e5291e9..747266e 100644
--- a/chrome/browser/dom_ui/most_visited_handler.cc
+++ b/chrome/browser/webui/most_visited_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/dom_ui/most_visited_handler.h"
+#include "chrome/browser/webui/most_visited_handler.h"
 
 #include <set>
 
@@ -17,15 +17,15 @@
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_thread.h"
-#include "chrome/browser/dom_ui/new_tab_ui.h"
-#include "chrome/browser/dom_ui/web_ui_favicon_source.h"
-#include "chrome/browser/dom_ui/web_ui_thumbnail_source.h"
 #include "chrome/browser/history/page_usage_data.h"
 #include "chrome/browser/history/top_sites.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/webui/chrome_url_data_manager.h"
+#include "chrome/browser/webui/new_tab_ui.h"
+#include "chrome/browser/webui/web_ui_favicon_source.h"
+#include "chrome/browser/webui/web_ui_thumbnail_source.h"
 #include "chrome/common/notification_source.h"
 #include "chrome/common/notification_type.h"
 #include "chrome/common/pref_names.h"
diff --git a/chrome/browser/dom_ui/most_visited_handler.h b/chrome/browser/webui/most_visited_handler.h
index 814d9e1..e93ed29 100644
--- a/chrome/browser/dom_ui/most_visited_handler.h
+++ b/chrome/browser/webui/most_visited_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_DOM_UI_MOST_VISITED_HANDLER_H_
-#define CHROME_BROWSER_DOM_UI_MOST_VISITED_HANDLER_H_
+#ifndef CHROME_BROWSER_WEBUI_MOST_VISITED_HANDLER_H_
+#define CHROME_BROWSER_WEBUI_MOST_VISITED_HANDLER_H_
 #pragma once
 
 #include <string>
@@ -133,4 +133,4 @@ class MostVisitedHandler : public WebUIMessageHandler,
   DISALLOW_COPY_AND_ASSIGN(MostVisitedHandler);
 };
 
-#endif  // CHROME_BROWSER_DOM_UI_MOST_VISITED_HANDLER_H_
+#endif  // CHROME_BROWSER_WEBUI_MOST_VISITED_HANDLER_H_
diff --git a/chrome/browser/dom_ui/new_tab_page_sync_handler.cc b/chrome/browser/webui/new_tab_page_sync_handler.cc
index ec3da8b..b3d4230 100644
--- a/chrome/browser/dom_ui/new_tab_page_sync_handler.cc
+++ b/chrome/browser/webui/new_tab_page_sync_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/dom_ui/new_tab_page_sync_handler.h"
+#include "chrome/browser/webui/new_tab_page_sync_handler.h"
 
 #include <vector>
 
diff --git a/chrome/browser/dom_ui/new_tab_page_sync_handler.h b/chrome/browser/webui/new_tab_page_sync_handler.h
index 672ac54..3a9e4a7 100644
--- a/chrome/browser/dom_ui/new_tab_page_sync_handler.h
+++ b/chrome/browser/webui/new_tab_page_sync_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_DOM_UI_NEW_TAB_PAGE_SYNC_HANDLER_H_
-#define CHROME_BROWSER_DOM_UI_NEW_TAB_PAGE_SYNC_HANDLER_H_
+#ifndef CHROME_BROWSER_WEBUI_NEW_TAB_PAGE_SYNC_HANDLER_H_
+#define CHROME_BROWSER_WEBUI_NEW_TAB_PAGE_SYNC_HANDLER_H_
 #pragma once
 
 #include <string>
@@ -66,4 +66,4 @@ class NewTabPageSyncHandler : public WebUIMessageHandler,
   DISALLOW_COPY_AND_ASSIGN(NewTabPageSyncHandler);
 };
 
-#endif  // CHROME_BROWSER_DOM_UI_NEW_TAB_PAGE_SYNC_HANDLER_H_
+#endif  // CHROME_BROWSER_WEBUI_NEW_TAB_PAGE_SYNC_HANDLER_H_
diff --git a/chrome/browser/dom_ui/new_tab_ui.cc b/chrome/browser/webui/new_tab_ui.cc
index 6594e1c..99a5e83 100644
--- a/chrome/browser/dom_ui/new_tab_ui.cc
+++ b/chrome/browser/webui/new_tab_ui.cc
@@ -4,7 +4,7 @@
 
 #include "build/build_config.h"
 
-#include "chrome/browser/dom_ui/new_tab_ui.h"
+#include "chrome/browser/webui/new_tab_ui.h"
 
 #include <set>
 
@@ -17,14 +17,6 @@
 #include "base/threading/thread.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_thread.h"
-#include "chrome/browser/dom_ui/most_visited_handler.h"
-#include "chrome/browser/dom_ui/new_tab_page_sync_handler.h"
-#include "chrome/browser/dom_ui/ntp_login_handler.h"
-#include "chrome/browser/dom_ui/ntp_resource_cache.h"
-#include "chrome/browser/dom_ui/shown_sections_handler.h"
-#include "chrome/browser/dom_ui/tips_handler.h"
-#include "chrome/browser/dom_ui/value_helper.h"
-#include "chrome/browser/dom_ui/web_ui_theme_source.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
@@ -38,6 +30,14 @@
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/webui/app_launcher_handler.h"
 #include "chrome/browser/webui/foreign_session_handler.h"
+#include "chrome/browser/webui/most_visited_handler.h"
+#include "chrome/browser/webui/new_tab_page_sync_handler.h"
+#include "chrome/browser/webui/ntp_login_handler.h"
+#include "chrome/browser/webui/ntp_resource_cache.h"
+#include "chrome/browser/webui/shown_sections_handler.h"
+#include "chrome/browser/webui/tips_handler.h"
+#include "chrome/browser/webui/value_helper.h"
+#include "chrome/browser/webui/web_ui_theme_source.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/notification_service.h"
diff --git a/chrome/browser/dom_ui/new_tab_ui.h b/chrome/browser/webui/new_tab_ui.h
index e513dc2..a627a00 100644
--- a/chrome/browser/dom_ui/new_tab_ui.h
+++ b/chrome/browser/webui/new_tab_ui.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_DOM_UI_NEW_TAB_UI_H_
-#define CHROME_BROWSER_DOM_UI_NEW_TAB_UI_H_
+#ifndef CHROME_BROWSER_WEBUI_NEW_TAB_UI_H_
+#define CHROME_BROWSER_WEBUI_NEW_TAB_UI_H_
 #pragma once
 
 #include <string>
@@ -118,4 +118,4 @@ class NewTabUI : public WebUI,
   DISALLOW_COPY_AND_ASSIGN(NewTabUI);
 };
 
-#endif  // CHROME_BROWSER_DOM_UI_NEW_TAB_UI_H_
+#endif  // CHROME_BROWSER_WEBUI_NEW_TAB_UI_H_
diff --git a/chrome/browser/dom_ui/new_tab_ui_uitest.cc b/chrome/browser/webui/new_tab_ui_uitest.cc
index 62c33e2..527c06c 100644
--- a/chrome/browser/dom_ui/new_tab_ui_uitest.cc
+++ b/chrome/browser/webui/new_tab_ui_uitest.cc
@@ -6,9 +6,9 @@
 
 #include "base/test/test_timeouts.h"
 #include "chrome/app/chrome_command_ids.h"
-#include "chrome/browser/dom_ui/new_tab_ui.h"
 #include "chrome/browser/prefs/pref_value_store.h"
 #include "chrome/browser/sync/signin_manager.h"
+#include "chrome/browser/webui/new_tab_ui.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/json_pref_store.h"
 #include "chrome/common/pref_names.h"
diff --git a/chrome/browser/dom_ui/ntp_login_handler.cc b/chrome/browser/webui/ntp_login_handler.cc
index 468343d..909ba8e 100644
--- a/chrome/browser/dom_ui/ntp_login_handler.cc
+++ b/chrome/browser/webui/ntp_login_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/dom_ui/ntp_login_handler.h"
+#include "chrome/browser/webui/ntp_login_handler.h"
 
 #include <string>
 
diff --git a/chrome/browser/dom_ui/ntp_login_handler.h b/chrome/browser/webui/ntp_login_handler.h
index 2213e2e..7921cf9 100644
--- a/chrome/browser/dom_ui/ntp_login_handler.h
+++ b/chrome/browser/webui/ntp_login_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_DOM_UI_NTP_LOGIN_HANDLER_H_
-#define CHROME_BROWSER_DOM_UI_NTP_LOGIN_HANDLER_H_
+#ifndef CHROME_BROWSER_WEBUI_NTP_LOGIN_HANDLER_H_
+#define CHROME_BROWSER_WEBUI_NTP_LOGIN_HANDLER_H_
 #pragma once
 
 #include "chrome/browser/prefs/pref_member.h"
@@ -39,4 +39,4 @@ class NTPLoginHandler : public WebUIMessageHandler,
   StringPrefMember username_pref_;
 };
 
-#endif  // CHROME_BROWSER_DOM_UI_NTP_LOGIN_HANDLER_H_
+#endif  // CHROME_BROWSER_WEBUI_NTP_LOGIN_HANDLER_H_
diff --git a/chrome/browser/dom_ui/ntp_resource_cache.cc b/chrome/browser/webui/ntp_resource_cache.cc
index 6803f0a..b78462b 100644
--- a/chrome/browser/dom_ui/ntp_resource_cache.cc
+++ b/chrome/browser/webui/ntp_resource_cache.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/dom_ui/ntp_resource_cache.h"
+#include "chrome/browser/webui/ntp_resource_cache.h"
 
 #include <algorithm>
 #include <vector>
@@ -16,13 +16,13 @@
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_thread.h"
-#include "chrome/browser/dom_ui/shown_sections_handler.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/themes/browser_theme_provider.h"
 #include "chrome/browser/web_resource/promo_resource_service.h"
 #include "chrome/browser/webui/chrome_url_data_manager.h"
+#include "chrome/browser/webui/shown_sections_handler.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
diff --git a/chrome/browser/dom_ui/ntp_resource_cache.h b/chrome/browser/webui/ntp_resource_cache.h
index b4d10b6..cb46270 100644
--- a/chrome/browser/dom_ui/ntp_resource_cache.h
+++ b/chrome/browser/webui/ntp_resource_cache.h
@@ -1,16 +1,16 @@
-// 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_DOM_UI_NTP_RESOURCE_CACHE_H_
-#define CHROME_BROWSER_DOM_UI_NTP_RESOURCE_CACHE_H_
+#ifndef CHROME_BROWSER_WEBUI_NTP_RESOURCE_CACHE_H_
+#define CHROME_BROWSER_WEBUI_NTP_RESOURCE_CACHE_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/ref_counted.h"
+#include "chrome/browser/prefs/pref_change_registrar.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
-#include "chrome/browser/prefs/pref_change_registrar.h"
 
 class Profile;
 class RefCountedBytes;
@@ -49,4 +49,4 @@ class NTPResourceCache : public NotificationObserver {
   DISALLOW_COPY_AND_ASSIGN(NTPResourceCache);
 };
 
-#endif  // CHROME_BROWSER_DOM_UI_NTP_RESOURCE_CACHE_H_
+#endif  // CHROME_BROWSER_WEBUI_NTP_RESOURCE_CACHE_H_
diff --git a/chrome/browser/webui/options/browser_options_handler.cc b/chrome/browser/webui/options/browser_options_handler.cc
index a44e896..5517573 100644
--- a/chrome/browser/webui/options/browser_options_handler.cc
+++ b/chrome/browser/webui/options/browser_options_handler.cc
@@ -13,7 +13,6 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/custom_home_pages_table_model.h"
-#include "chrome/browser/dom_ui/web_ui_favicon_source.h"
 #include "chrome/browser/instant/instant_confirm_dialog.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/net/url_fixer_upper.h"
@@ -25,6 +24,7 @@
 #include "chrome/browser/ui/options/options_window.h"
 #include "chrome/browser/webui/options/dom_options_util.h"
 #include "chrome/browser/webui/options/options_managed_banner_handler.h"
+#include "chrome/browser/webui/web_ui_favicon_source.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "grit/chromium_strings.h"
diff --git a/chrome/browser/webui/options/options_ui.cc b/chrome/browser/webui/options/options_ui.cc
index 533d8fd..cb29fbd 100644
--- a/chrome/browser/webui/options/options_ui.cc
+++ b/chrome/browser/webui/options/options_ui.cc
@@ -18,7 +18,6 @@
 #include "base/values.h"
 #include "chrome/browser/browser_about_handler.h"
 #include "chrome/browser/browser_thread.h"
-#include "chrome/browser/dom_ui/web_ui_theme_source.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
@@ -41,6 +40,7 @@
 #include "chrome/browser/webui/options/personal_options_handler.h"
 #include "chrome/browser/webui/options/search_engine_manager_handler.h"
 #include "chrome/browser/webui/options/stop_syncing_handler.h"
+#include "chrome/browser/webui/web_ui_theme_source.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/notification_type.h"
 #include "chrome/common/time_format.h"
diff --git a/chrome/browser/dom_ui/print_preview_handler.cc b/chrome/browser/webui/print_preview_handler.cc
index 45d4eac..320ee99 100644
--- a/chrome/browser/dom_ui/print_preview_handler.cc
+++ b/chrome/browser/webui/print_preview_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/dom_ui/print_preview_handler.h"
+#include "chrome/browser/webui/print_preview_handler.h"
 
 #include "base/values.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
diff --git a/chrome/browser/dom_ui/print_preview_handler.h b/chrome/browser/webui/print_preview_handler.h
index ad2751d..96d308a 100644
--- a/chrome/browser/dom_ui/print_preview_handler.h
+++ b/chrome/browser/webui/print_preview_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_DOM_UI_PRINT_PREVIEW_HANDLER_H_
-#define CHROME_BROWSER_DOM_UI_PRINT_PREVIEW_HANDLER_H_
+#ifndef CHROME_BROWSER_WEBUI_PRINT_PREVIEW_HANDLER_H_
+#define CHROME_BROWSER_WEBUI_PRINT_PREVIEW_HANDLER_H_
 #pragma once
 
 #include "base/ref_counted.h"
@@ -37,4 +37,4 @@ class PrintPreviewHandler : public WebUIMessageHandler,
   DISALLOW_COPY_AND_ASSIGN(PrintPreviewHandler);
 };
 
-#endif  // CHROME_BROWSER_DOM_UI_PRINT_PREVIEW_HANDLER_H_
+#endif  // CHROME_BROWSER_WEBUI_PRINT_PREVIEW_HANDLER_H_
diff --git a/chrome/browser/dom_ui/print_preview_ui.cc b/chrome/browser/webui/print_preview_ui.cc
index 92fdc41..18a52c5 100644
--- a/chrome/browser/dom_ui/print_preview_ui.cc
+++ b/chrome/browser/webui/print_preview_ui.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/dom_ui/print_preview_ui.h"
+#include "chrome/browser/webui/print_preview_ui.h"
 
 #include "base/values.h"
 #include "chrome/browser/browser_thread.h"
-#include "chrome/browser/dom_ui/print_preview_handler.h"
-#include "chrome/browser/dom_ui/print_preview_ui_html_source.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/browser/webui/print_preview_handler.h"
+#include "chrome/browser/webui/print_preview_ui_html_source.h"
 
 PrintPreviewUI::PrintPreviewUI(TabContents* contents)
     : WebUI(contents),
diff --git a/chrome/browser/dom_ui/print_preview_ui.h b/chrome/browser/webui/print_preview_ui.h
index 77d0add..0824d7f 100644
--- a/chrome/browser/dom_ui/print_preview_ui.h
+++ b/chrome/browser/webui/print_preview_ui.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_DOM_UI_PRINT_PREVIEW_UI_H_
-#define CHROME_BROWSER_DOM_UI_PRINT_PREVIEW_UI_H_
+#ifndef CHROME_BROWSER_WEBUI_PRINT_PREVIEW_UI_H_
+#define CHROME_BROWSER_WEBUI_PRINT_PREVIEW_UI_H_
 #pragma once
 
 #include "base/ref_counted.h"
@@ -28,4 +28,4 @@ class PrintPreviewUI : public WebUI {
   DISALLOW_COPY_AND_ASSIGN(PrintPreviewUI);
 };
 
-#endif  // CHROME_BROWSER_DOM_UI_PRINT_PREVIEW_UI_H_
+#endif  // CHROME_BROWSER_WEBUI_PRINT_PREVIEW_UI_H_
diff --git a/chrome/browser/dom_ui/print_preview_ui_html_source.cc b/chrome/browser/webui/print_preview_ui_html_source.cc
index f46771f..3ac0f37 100644
--- a/chrome/browser/dom_ui/print_preview_ui_html_source.cc
+++ b/chrome/browser/webui/print_preview_ui_html_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/dom_ui/print_preview_ui_html_source.h"
+#include "chrome/browser/webui/print_preview_ui_html_source.h"
 
 #include <algorithm>
 #include <vector>
diff --git a/chrome/browser/dom_ui/print_preview_ui_html_source.h b/chrome/browser/webui/print_preview_ui_html_source.h
index 7950ed4..ca33cb1 100644
--- a/chrome/browser/dom_ui/print_preview_ui_html_source.h
+++ b/chrome/browser/webui/print_preview_ui_html_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_DOM_UI_PRINT_PREVIEW_UI_HTML_SOURCE_H_
-#define CHROME_BROWSER_DOM_UI_PRINT_PREVIEW_UI_HTML_SOURCE_H_
+#ifndef CHROME_BROWSER_WEBUI_PRINT_PREVIEW_UI_HTML_SOURCE_H_
+#define CHROME_BROWSER_WEBUI_PRINT_PREVIEW_UI_HTML_SOURCE_H_
 #pragma once
 
 #include <string>
@@ -48,4 +48,4 @@ class PrintPreviewUIHTMLSource : public ChromeURLDataManager::DataSource {
   DISALLOW_COPY_AND_ASSIGN(PrintPreviewUIHTMLSource);
 };
 
-#endif  // CHROME_BROWSER_DOM_UI_PRINT_PREVIEW_UI_HTML_SOURCE_H_
+#endif  // CHROME_BROWSER_WEBUI_PRINT_PREVIEW_UI_HTML_SOURCE_H_
diff --git a/chrome/browser/dom_ui/print_preview_ui_html_source_unittest.cc b/chrome/browser/webui/print_preview_ui_html_source_unittest.cc
index 0dc4646..a489c1c 100644
--- a/chrome/browser/dom_ui/print_preview_ui_html_source_unittest.cc
+++ b/chrome/browser/webui/print_preview_ui_html_source_unittest.cc
@@ -4,11 +4,11 @@
 
 #include "base/command_line.h"
 #include "base/shared_memory.h"
-#include "chrome/browser/dom_ui/print_preview_ui.h"
-#include "chrome/browser/dom_ui/print_preview_ui_html_source.h"
 #include "chrome/browser/printing/print_preview_tab_controller.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/browser_list.h"
+#include "chrome/browser/webui/print_preview_ui.h"
+#include "chrome/browser/webui/print_preview_ui_html_source.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/browser_with_test_window_test.h"
 #include "chrome/test/testing_profile.h"
diff --git a/chrome/browser/dom_ui/print_preview_ui_uitest.cc b/chrome/browser/webui/print_preview_ui_uitest.cc
index 5246843..d53cf33 100644
--- a/chrome/browser/dom_ui/print_preview_ui_uitest.cc
+++ b/chrome/browser/webui/print_preview_ui_uitest.cc
@@ -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.
 
diff --git a/chrome/browser/dom_ui/settings_browsertest.cc b/chrome/browser/webui/settings_browsertest.cc
index 789de66..0042315 100644
--- a/chrome/browser/dom_ui/settings_browsertest.cc
+++ b/chrome/browser/webui/settings_browsertest.cc
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/dom_ui/web_ui_browsertest.h"
 #include "chrome/browser/webui/options/core_options_handler.h"
+#include "chrome/browser/webui/web_ui_browsertest.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/ui_test_utils.h"
 #include "googleurl/src/gurl.h"
diff --git a/chrome/browser/dom_ui/shared_resources_data_source.cc b/chrome/browser/webui/shared_resources_data_source.cc
index aac3896..eeddacd 100644
--- a/chrome/browser/dom_ui/shared_resources_data_source.cc
+++ b/chrome/browser/webui/shared_resources_data_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/dom_ui/shared_resources_data_source.h"
+#include "chrome/browser/webui/shared_resources_data_source.h"
 
 #include <string>
 
diff --git a/chrome/browser/dom_ui/shared_resources_data_source.h b/chrome/browser/webui/shared_resources_data_source.h
index 90be057..5547458 100644
--- a/chrome/browser/dom_ui/shared_resources_data_source.h
+++ b/chrome/browser/webui/shared_resources_data_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_DOM_UI_SHARED_RESOURCES_DATA_SOURCE_H_
-#define CHROME_BROWSER_DOM_UI_SHARED_RESOURCES_DATA_SOURCE_H_
+#ifndef CHROME_BROWSER_WEBUI_SHARED_RESOURCES_DATA_SOURCE_H_
+#define CHROME_BROWSER_WEBUI_SHARED_RESOURCES_DATA_SOURCE_H_
 #pragma once
 
 #include "chrome/browser/webui/chrome_url_data_manager.h"
@@ -32,4 +32,4 @@ class SharedResourcesDataSource : public ChromeURLDataManager::DataSource {
   DISALLOW_COPY_AND_ASSIGN(SharedResourcesDataSource);
 };
 
-#endif  // CHROME_BROWSER_DOM_UI_SHARED_RESOURCES_DATA_SOURCE_H_
+#endif  // CHROME_BROWSER_WEBUI_SHARED_RESOURCES_DATA_SOURCE_H_
diff --git a/chrome/browser/dom_ui/shown_sections_handler.cc b/chrome/browser/webui/shown_sections_handler.cc
index 96afe93..9790ffb 100644
--- a/chrome/browser/dom_ui/shown_sections_handler.cc
+++ b/chrome/browser/webui/shown_sections_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/dom_ui/shown_sections_handler.h"
+#include "chrome/browser/webui/shown_sections_handler.h"
 
 #include <string>
 
diff --git a/chrome/browser/dom_ui/shown_sections_handler.h b/chrome/browser/webui/shown_sections_handler.h
index 3eb75ee..84916d2 100644
--- a/chrome/browser/dom_ui/shown_sections_handler.h
+++ b/chrome/browser/webui/shown_sections_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_DOM_UI_SHOWN_SECTIONS_HANDLER_H_
-#define CHROME_BROWSER_DOM_UI_SHOWN_SECTIONS_HANDLER_H_
+#ifndef CHROME_BROWSER_WEBUI_SHOWN_SECTIONS_HANDLER_H_
+#define CHROME_BROWSER_WEBUI_SHOWN_SECTIONS_HANDLER_H_
 #pragma once
 
 #include "chrome/browser/prefs/pref_change_registrar.h"
@@ -76,4 +76,4 @@ class ShownSectionsHandler : public WebUIMessageHandler,
   DISALLOW_COPY_AND_ASSIGN(ShownSectionsHandler);
 };
 
-#endif  // CHROME_BROWSER_DOM_UI_SHOWN_SECTIONS_HANDLER_H_
+#endif  // CHROME_BROWSER_WEBUI_SHOWN_SECTIONS_HANDLER_H_
diff --git a/chrome/browser/dom_ui/shown_sections_handler_unittest.cc b/chrome/browser/webui/shown_sections_handler_unittest.cc
index 7ca5631..fce8b6c 100644
--- a/chrome/browser/dom_ui/shown_sections_handler_unittest.cc
+++ b/chrome/browser/webui/shown_sections_handler_unittest.cc
@@ -1,8 +1,8 @@
-// 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.
 
-#include "chrome/browser/dom_ui/shown_sections_handler.h"
+#include "chrome/browser/webui/shown_sections_handler.h"
 
 #include "base/scoped_ptr.h"
 #include "chrome/browser/prefs/pref_value_store.h"
diff --git a/chrome/browser/webui/slideshow_ui.cc b/chrome/browser/webui/slideshow_ui.cc
index eafe307..ed0da67 100644
--- a/chrome/browser/webui/slideshow_ui.cc
+++ b/chrome/browser/webui/slideshow_ui.cc
@@ -16,11 +16,11 @@
 #include "base/values.h"
 #include "base/weak_ptr.h"
 #include "chrome/browser/browser_thread.h"
-#include "chrome/browser/dom_ui/web_ui_favicon_source.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/browser/webui/web_ui_favicon_source.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/url_constants.h"
diff --git a/chrome/browser/dom_ui/sync_internals_html_source.cc b/chrome/browser/webui/sync_internals_html_source.cc
index c35aaab..727ca6b 100644
--- a/chrome/browser/dom_ui/sync_internals_html_source.cc
+++ b/chrome/browser/webui/sync_internals_html_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/dom_ui/sync_internals_html_source.h"
+#include "chrome/browser/webui/sync_internals_html_source.h"
 
 #include <algorithm>
 
diff --git a/chrome/browser/dom_ui/sync_internals_html_source.h b/chrome/browser/webui/sync_internals_html_source.h
index 969a11a..ad5a130 100644
--- a/chrome/browser/dom_ui/sync_internals_html_source.h
+++ b/chrome/browser/webui/sync_internals_html_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_DOM_UI_SYNC_INTERNALS_HTML_SOURCE_H_
-#define CHROME_BROWSER_DOM_UI_SYNC_INTERNALS_HTML_SOURCE_H_
+#ifndef CHROME_BROWSER_WEBUI_SYNC_INTERNALS_HTML_SOURCE_H_
+#define CHROME_BROWSER_WEBUI_SYNC_INTERNALS_HTML_SOURCE_H_
 #pragma once
 
 #include <string>
@@ -28,4 +28,4 @@ class SyncInternalsHTMLSource : public ChromeURLDataManager::DataSource {
   DISALLOW_COPY_AND_ASSIGN(SyncInternalsHTMLSource);
 };
 
-#endif  // CHROME_BROWSER_DOM_UI_SYNC_INTERNALS_HTML_SOURCE_H_
+#endif  // CHROME_BROWSER_WEBUI_SYNC_INTERNALS_HTML_SOURCE_H_
diff --git a/chrome/browser/dom_ui/sync_internals_ui.cc b/chrome/browser/webui/sync_internals_ui.cc
index fd81d8b..3f1a12f 100644
--- a/chrome/browser/dom_ui/sync_internals_ui.cc
+++ b/chrome/browser/webui/sync_internals_ui.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/dom_ui/sync_internals_ui.h"
+#include "chrome/browser/webui/sync_internals_ui.h"
 
 #include <string>
 
@@ -12,13 +12,13 @@
 #include "base/tracked_objects.h"
 #include "base/values.h"
 #include "chrome/browser/browser_thread.h"
-#include "chrome/browser/dom_ui/sync_internals_html_source.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/js_arg_list.h"
 #include "chrome/browser/sync/js_frontend.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/sync_ui_util.h"
 #include "chrome/browser/webui/chrome_url_data_manager.h"
+#include "chrome/browser/webui/sync_internals_html_source.h"
 #include "chrome/common/render_messages_params.h"
 
 SyncInternalsUI::SyncInternalsUI(TabContents* contents)
diff --git a/chrome/browser/dom_ui/sync_internals_ui.h b/chrome/browser/webui/sync_internals_ui.h
index 5060426..3434841 100644
--- a/chrome/browser/dom_ui/sync_internals_ui.h
+++ b/chrome/browser/webui/sync_internals_ui.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_DOM_UI_SYNC_INTERNALS_UI_H_
-#define CHROME_BROWSER_DOM_UI_SYNC_INTERNALS_UI_H_
+#ifndef CHROME_BROWSER_WEBUI_SYNC_INTERNALS_UI_H_
+#define CHROME_BROWSER_WEBUI_SYNC_INTERNALS_UI_H_
 #pragma once
 
 #include <string>
@@ -50,4 +50,4 @@ class SyncInternalsUI : public WebUI, public browser_sync::JsEventHandler {
   DISALLOW_COPY_AND_ASSIGN(SyncInternalsUI);
 };
 
-#endif  // CHROME_BROWSER_DOM_UI_SYNC_INTERNALS_UI_H_
+#endif  // CHROME_BROWSER_WEBUI_SYNC_INTERNALS_UI_H_
diff --git a/chrome/browser/dom_ui/sync_internals_ui_unittest.cc b/chrome/browser/webui/sync_internals_ui_unittest.cc
index a1f392e..ffb0fb8 100644
--- a/chrome/browser/dom_ui/sync_internals_ui_unittest.cc
+++ b/chrome/browser/webui/sync_internals_ui_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/dom_ui/sync_internals_ui.h"
+#include "chrome/browser/webui/sync_internals_ui.h"
 
 #include <cstddef>
 #include <string>
diff --git a/chrome/browser/dom_ui/textfields_ui.cc b/chrome/browser/webui/textfields_ui.cc
index 7d8891d..f8a25ea 100644
--- a/chrome/browser/dom_ui/textfields_ui.cc
+++ b/chrome/browser/webui/textfields_ui.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/dom_ui/textfields_ui.h"
+#include "chrome/browser/webui/textfields_ui.h"
 
 #include <algorithm>
 #include <string>
diff --git a/chrome/browser/dom_ui/textfields_ui.h b/chrome/browser/webui/textfields_ui.h
index 145ec69..7d97801 100644
--- a/chrome/browser/dom_ui/textfields_ui.h
+++ b/chrome/browser/webui/textfields_ui.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_DOM_UI_TEXTFIELDS_UI_H_
-#define CHROME_BROWSER_DOM_UI_TEXTFIELDS_UI_H_
+#ifndef CHROME_BROWSER_WEBUI_TEXTFIELDS_UI_H_
+#define CHROME_BROWSER_WEBUI_TEXTFIELDS_UI_H_
 #pragma once
 
 #include <string>
@@ -68,4 +68,4 @@ class TextfieldsUI : public WebUI {
   DISALLOW_COPY_AND_ASSIGN(TextfieldsUI);
 };
 
-#endif  // CHROME_BROWSER_DOM_UI_TEXTFIELDS_UI_H_
+#endif  // CHROME_BROWSER_WEBUI_TEXTFIELDS_UI_H_
diff --git a/chrome/browser/dom_ui/tips_handler.cc b/chrome/browser/webui/tips_handler.cc
index a636682..663b3be 100644
--- a/chrome/browser/dom_ui/tips_handler.cc
+++ b/chrome/browser/webui/tips_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/dom_ui/tips_handler.h"
+#include "chrome/browser/webui/tips_handler.h"
 
 #include <string>
 
@@ -14,8 +14,8 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/web_resource/promo_resource_service.h"
 #include "chrome/common/pref_names.h"
-#include "chrome/common/web_resource/web_resource_unpacker.h"
 #include "chrome/common/url_constants.h"
+#include "chrome/common/web_resource/web_resource_unpacker.h"
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
diff --git a/chrome/browser/dom_ui/tips_handler.h b/chrome/browser/webui/tips_handler.h
index 1a2cccf..5dd0186 100644
--- a/chrome/browser/dom_ui/tips_handler.h
+++ b/chrome/browser/webui/tips_handler.h
@@ -6,8 +6,8 @@
 // has been stored in the user's preferences file.  Used mainly
 // by the suggestions and tips area of the new tab page.
 
-#ifndef CHROME_BROWSER_DOM_UI_TIPS_HANDLER_H_
-#define CHROME_BROWSER_DOM_UI_TIPS_HANDLER_H_
+#ifndef CHROME_BROWSER_WEBUI_TIPS_HANDLER_H_
+#define CHROME_BROWSER_WEBUI_TIPS_HANDLER_H_
 #pragma once
 
 #include <string>
@@ -52,5 +52,5 @@ class TipsHandler : public WebUIMessageHandler {
   DISALLOW_COPY_AND_ASSIGN(TipsHandler);
 };
 
-#endif  // CHROME_BROWSER_DOM_UI_TIPS_HANDLER_H_
+#endif  // CHROME_BROWSER_WEBUI_TIPS_HANDLER_H_
 
diff --git a/chrome/browser/dom_ui/value_helper.cc b/chrome/browser/webui/value_helper.cc
index 93c1137..f18e0d4 100644
--- a/chrome/browser/dom_ui/value_helper.cc
+++ b/chrome/browser/webui/value_helper.cc
@@ -1,10 +1,10 @@
-// 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.
 
-#include "chrome/browser/dom_ui/value_helper.h"
+#include "chrome/browser/webui/value_helper.h"
 
-#include "chrome/browser/dom_ui/new_tab_ui.h"
+#include "chrome/browser/webui/new_tab_ui.h"
 #include "chrome/common/url_constants.h"
 
 bool ValueHelper::TabToValue(
diff --git a/chrome/browser/dom_ui/value_helper.h b/chrome/browser/webui/value_helper.h
index b6a11777..4a0706f 100644
--- a/chrome/browser/dom_ui/value_helper.h
+++ b/chrome/browser/webui/value_helper.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_DOM_UI_VALUE_HELPER_H_
-#define CHROME_BROWSER_DOM_UI_VALUE_HELPER_H_
+#ifndef CHROME_BROWSER_WEBUI_VALUE_HELPER_H_
+#define CHROME_BROWSER_WEBUI_VALUE_HELPER_H_
 #pragma once
 
 #include "chrome/browser/sessions/tab_restore_service.h"
@@ -21,5 +21,5 @@ class ValueHelper {
   DISALLOW_IMPLICIT_CONSTRUCTORS(ValueHelper);
 };
 
-#endif  // CHROME_BROWSER_DOM_UI_VALUE_HELPER_H_
+#endif  // CHROME_BROWSER_WEBUI_VALUE_HELPER_H_
 
diff --git a/chrome/browser/dom_ui/web_ui_browsertest.cc b/chrome/browser/webui/web_ui_browsertest.cc
index 6bb35bf..a169fc3 100644
--- a/chrome/browser/dom_ui/web_ui_browsertest.cc
+++ b/chrome/browser/webui/web_ui_browsertest.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/dom_ui/web_ui_browsertest.h"
+#include "chrome/browser/webui/web_ui_browsertest.h"
 
 #include "base/path_service.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
diff --git a/chrome/browser/dom_ui/web_ui_browsertest.h b/chrome/browser/webui/web_ui_browsertest.h
index 44db102..4332a27 100644
--- a/chrome/browser/dom_ui/web_ui_browsertest.h
+++ b/chrome/browser/webui/web_ui_browsertest.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_DOM_UI_WEB_UI_BROWSERTEST_H_
-#define CHROME_BROWSER_DOM_UI_WEB_UI_BROWSERTEST_H_
+#ifndef CHROME_BROWSER_WEBUI_WEB_UI_BROWSERTEST_H_
+#define CHROME_BROWSER_WEBUI_WEB_UI_BROWSERTEST_H_
 #pragma once
 
 #include <string>
 
 #include "base/file_path.h"
-#include "chrome/browser/dom_ui/web_ui_handler_browsertest.h"
+#include "chrome/browser/webui/web_ui_handler_browsertest.h"
 #include "chrome/test/in_process_browser_test.h"
 
 class WebUIMessageHandler;
@@ -55,4 +55,4 @@ class WebUIBrowserTest : public InProcessBrowserTest {
   FilePath test_data_directory_;
 };
 
-#endif  // CHROME_BROWSER_DOM_UI_WEB_UI_BROWSERTEST_H_
+#endif  // CHROME_BROWSER_WEBUI_WEB_UI_BROWSERTEST_H_
diff --git a/chrome/browser/webui/web_ui_factory.cc b/chrome/browser/webui/web_ui_factory.cc
index 3a73ad6..6cd39b1 100644
--- a/chrome/browser/webui/web_ui_factory.cc
+++ b/chrome/browser/webui/web_ui_factory.cc
@@ -6,10 +6,6 @@
 
 #include "base/command_line.h"
 #include "chrome/browser/about_flags.h"
-#include "chrome/browser/dom_ui/new_tab_ui.h"
-#include "chrome/browser/dom_ui/print_preview_ui.h"
-#include "chrome/browser/dom_ui/sync_internals_ui.h"
-#include "chrome/browser/dom_ui/textfields_ui.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_web_ui.h"
 #include "chrome/browser/extensions/extensions_ui.h"
@@ -28,10 +24,14 @@
 #include "chrome/browser/webui/history_ui.h"
 #include "chrome/browser/webui/html_dialog_ui.h"
 #include "chrome/browser/webui/net_internals_ui.h"
+#include "chrome/browser/webui/new_tab_ui.h"
 #include "chrome/browser/webui/options/options_ui.h"
 #include "chrome/browser/webui/plugins_ui.h"
+#include "chrome/browser/webui/print_preview_ui.h"
 #include "chrome/browser/webui/remoting_ui.h"
 #include "chrome/browser/webui/slideshow_ui.h"
+#include "chrome/browser/webui/sync_internals_ui.h"
+#include "chrome/browser/webui/textfields_ui.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/url_constants.h"
diff --git a/chrome/browser/dom_ui/web_ui_favicon_source.cc b/chrome/browser/webui/web_ui_favicon_source.cc
index f2d7128..e7f0d06 100644
--- a/chrome/browser/dom_ui/web_ui_favicon_source.cc
+++ b/chrome/browser/webui/web_ui_favicon_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/dom_ui/web_ui_favicon_source.h"
+#include "chrome/browser/webui/web_ui_favicon_source.h"
 
 #include "base/callback.h"
 #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/dom_ui/web_ui_favicon_source.h b/chrome/browser/webui/web_ui_favicon_source.h
index 1808128..5a538fa 100644
--- a/chrome/browser/dom_ui/web_ui_favicon_source.h
+++ b/chrome/browser/webui/web_ui_favicon_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_DOM_UI_WEB_UI_FAVICON_SOURCE_H_
-#define CHROME_BROWSER_DOM_UI_WEB_UI_FAVICON_SOURCE_H_
+#ifndef CHROME_BROWSER_WEBUI_WEB_UI_FAVICON_SOURCE_H_
+#define CHROME_BROWSER_WEBUI_WEB_UI_FAVICON_SOURCE_H_
 #pragma once
 
 #include <string>
@@ -53,4 +53,4 @@ class WebUIFavIconSource : public ChromeURLDataManager::DataSource {
   DISALLOW_COPY_AND_ASSIGN(WebUIFavIconSource);
 };
 
-#endif  // CHROME_BROWSER_DOM_UI_WEB_UI_FAVICON_SOURCE_H_
+#endif  // CHROME_BROWSER_WEBUI_WEB_UI_FAVICON_SOURCE_H_
diff --git a/chrome/browser/dom_ui/web_ui_handler_browsertest.cc b/chrome/browser/webui/web_ui_handler_browsertest.cc
index de15805..be683cfc 100644
--- a/chrome/browser/dom_ui/web_ui_handler_browsertest.cc
+++ b/chrome/browser/webui/web_ui_handler_browsertest.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/dom_ui/web_ui_handler_browsertest.h"
+#include "chrome/browser/webui/web_ui_handler_browsertest.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
diff --git a/chrome/browser/dom_ui/web_ui_handler_browsertest.h b/chrome/browser/webui/web_ui_handler_browsertest.h
index 36bae01..2ab8e1d 100644
--- a/chrome/browser/dom_ui/web_ui_handler_browsertest.h
+++ b/chrome/browser/webui/web_ui_handler_browsertest.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_DOM_UI_WEB_UI_HANDLER_BROWSERTEST_H_
-#define CHROME_BROWSER_DOM_UI_WEB_UI_HANDLER_BROWSERTEST_H_
+#ifndef CHROME_BROWSER_WEBUI_WEB_UI_HANDLER_BROWSERTEST_H_
+#define CHROME_BROWSER_WEBUI_WEB_UI_HANDLER_BROWSERTEST_H_
 #pragma once
 
 #include <string>
@@ -37,4 +37,4 @@ class WebUIHandlerBrowserTest : public WebUIMessageHandler {
   bool is_waiting_;
 };
 
-#endif  // CHROME_BROWSER_DOM_UI_WEB_UI_HANDLER_BROWSERTEST_H_
+#endif  // CHROME_BROWSER_WEBUI_WEB_UI_HANDLER_BROWSERTEST_H_
diff --git a/chrome/browser/dom_ui/web_ui_screenshot_source.cc b/chrome/browser/webui/web_ui_screenshot_source.cc
index 84b78e1..d929e22 100644
--- a/chrome/browser/dom_ui/web_ui_screenshot_source.cc
+++ b/chrome/browser/webui/web_ui_screenshot_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/dom_ui/web_ui_screenshot_source.h"
+#include "chrome/browser/webui/web_ui_screenshot_source.h"
 
 #include "base/file_util.h"
 #include "base/path_service.h"
diff --git a/chrome/browser/dom_ui/web_ui_screenshot_source.h b/chrome/browser/webui/web_ui_screenshot_source.h
index e5955c0f..ca57c93 100644
--- a/chrome/browser/dom_ui/web_ui_screenshot_source.h
+++ b/chrome/browser/webui/web_ui_screenshot_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_DOM_UI_WEB_UI_SCREENSHOT_SOURCE_H_
-#define CHROME_BROWSER_DOM_UI_WEB_UI_SCREENSHOT_SOURCE_H_
+#ifndef CHROME_BROWSER_WEBUI_WEB_UI_SCREENSHOT_SOURCE_H_
+#define CHROME_BROWSER_WEBUI_WEB_UI_SCREENSHOT_SOURCE_H_
 
 #include <string>
 #include <vector>
@@ -36,4 +36,4 @@ class WebUIScreenshotSource : public ChromeURLDataManager::DataSource {
   DISALLOW_COPY_AND_ASSIGN(WebUIScreenshotSource);
 };
 
-#endif  // CHROME_BROWSER_DOM_UI_WEB_UI_SCREENSHOT_SOURCE_H_
+#endif  // CHROME_BROWSER_WEBUI_WEB_UI_SCREENSHOT_SOURCE_H_
diff --git a/chrome/browser/dom_ui/web_ui_theme_source.cc b/chrome/browser/webui/web_ui_theme_source.cc
index b91ab6a..5a65bdd 100644
--- a/chrome/browser/dom_ui/web_ui_theme_source.cc
+++ b/chrome/browser/webui/web_ui_theme_source.cc
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/dom_ui/web_ui_theme_source.h"
+#include "chrome/browser/webui/web_ui_theme_source.h"
 
 #include "base/message_loop.h"
 #include "base/ref_counted_memory.h"
 #include "chrome/browser/browser_thread.h"
-#include "chrome/browser/dom_ui/ntp_resource_cache.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/resources_util.h"
 #include "chrome/browser/themes/browser_theme_provider.h"
+#include "chrome/browser/webui/ntp_resource_cache.h"
 #include "chrome/common/url_constants.h"
 #include "googleurl/src/gurl.h"
 #include "ui/base/resource/resource_bundle.h"
diff --git a/chrome/browser/dom_ui/web_ui_theme_source.h b/chrome/browser/webui/web_ui_theme_source.h
index 2b66635..3b1bb82 100644
--- a/chrome/browser/dom_ui/web_ui_theme_source.h
+++ b/chrome/browser/webui/web_ui_theme_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_DOM_UI_WEB_UI_THEME_SOURCE_H_
-#define CHROME_BROWSER_DOM_UI_WEB_UI_THEME_SOURCE_H_
+#ifndef CHROME_BROWSER_WEBUI_WEB_UI_THEME_SOURCE_H_
+#define CHROME_BROWSER_WEBUI_WEB_UI_THEME_SOURCE_H_
 #pragma once
 
 #include <string>
@@ -43,4 +43,4 @@ class WebUIThemeSource : public ChromeURLDataManager::DataSource {
   DISALLOW_COPY_AND_ASSIGN(WebUIThemeSource);
 };
 
-#endif  // CHROME_BROWSER_DOM_UI_WEB_UI_THEME_SOURCE_H_
+#endif  // CHROME_BROWSER_WEBUI_WEB_UI_THEME_SOURCE_H_
diff --git a/chrome/browser/dom_ui/web_ui_theme_source_unittest.cc b/chrome/browser/webui/web_ui_theme_source_unittest.cc
index 5d9b3cd..bc3f305 100644
--- a/chrome/browser/dom_ui/web_ui_theme_source_unittest.cc
+++ b/chrome/browser/webui/web_ui_theme_source_unittest.cc
@@ -4,9 +4,9 @@
 
 #include "base/ref_counted_memory.h"
 #include "chrome/browser/browser_thread.h"
-#include "chrome/browser/dom_ui/web_ui_theme_source.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/themes/browser_theme_provider.h"
+#include "chrome/browser/webui/web_ui_theme_source.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/testing_profile.h"
 #include "grit/theme_resources.h"
diff --git a/chrome/browser/dom_ui/web_ui_thumbnail_source.cc b/chrome/browser/webui/web_ui_thumbnail_source.cc
index 0f28b30..2341667 100644
--- a/chrome/browser/dom_ui/web_ui_thumbnail_source.cc
+++ b/chrome/browser/webui/web_ui_thumbnail_source.cc
@@ -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/dom_ui/web_ui_thumbnail_source.h"
+#include "chrome/browser/webui/web_ui_thumbnail_source.h"
 
 #include "base/callback.h"
-#include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/history/top_sites.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/dom_ui/web_ui_thumbnail_source.h b/chrome/browser/webui/web_ui_thumbnail_source.h
index 82dd36d..79697ff 100644
--- a/chrome/browser/dom_ui/web_ui_thumbnail_source.h
+++ b/chrome/browser/webui/web_ui_thumbnail_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_DOM_UI_WEB_UI_THUMBNAIL_SOURCE_H_
-#define CHROME_BROWSER_DOM_UI_WEB_UI_THUMBNAIL_SOURCE_H_
+#ifndef CHROME_BROWSER_WEBUI_WEB_UI_THUMBNAIL_SOURCE_H_
+#define CHROME_BROWSER_WEBUI_WEB_UI_THUMBNAIL_SOURCE_H_
 #pragma once
 
 #include <string>
@@ -51,4 +51,4 @@ class WebUIThumbnailSource : public ChromeURLDataManager::DataSource {
   DISALLOW_COPY_AND_ASSIGN(WebUIThumbnailSource);
 };
 
-#endif  // CHROME_BROWSER_DOM_UI_WEB_UI_THUMBNAIL_SOURCE_H_
+#endif  // CHROME_BROWSER_WEBUI_WEB_UI_THUMBNAIL_SOURCE_H_
diff --git a/chrome/browser/webui/web_ui_unittest.cc b/chrome/browser/webui/web_ui_unittest.cc
index c0ccc1c..5c2aa31 100644
--- a/chrome/browser/webui/web_ui_unittest.cc
+++ b/chrome/browser/webui/web_ui_unittest.cc
@@ -3,11 +3,11 @@
 // found in the LICENSE file.
 
 #include "chrome/browser/browser_thread.h"
-#include "chrome/browser/dom_ui/new_tab_ui.h"
 #include "chrome/browser/renderer_host/site_instance.h"
 #include "chrome/browser/renderer_host/test/test_render_view_host.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
 #include "chrome/browser/tab_contents/test_tab_contents.h"
+#include "chrome/browser/webui/new_tab_ui.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/testing_profile.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 8648242..d3d03a4 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -835,44 +835,6 @@
         'browser/diagnostics/sqlite_diagnostics.cc',
         'browser/diagnostics/sqlite_diagnostics.h',
         'browser/dom_operation_notification_details.h',
-        'browser/dom_ui/most_visited_handler.cc',
-        'browser/dom_ui/most_visited_handler.h',
-        'browser/dom_ui/new_tab_page_sync_handler.cc',
-        'browser/dom_ui/new_tab_page_sync_handler.h',
-        'browser/dom_ui/new_tab_ui.cc',
-        'browser/dom_ui/new_tab_ui.h',
-        'browser/dom_ui/ntp_login_handler.cc',
-        'browser/dom_ui/ntp_login_handler.h',
-        'browser/dom_ui/ntp_resource_cache.cc',
-        'browser/dom_ui/ntp_resource_cache.h',
-        'browser/dom_ui/print_preview_handler.cc',
-        'browser/dom_ui/print_preview_handler.h',
-        'browser/dom_ui/print_preview_ui.cc',
-        'browser/dom_ui/print_preview_ui.h',
-        'browser/dom_ui/print_preview_ui_html_source.cc',
-        'browser/dom_ui/print_preview_ui_html_source.h',
-        'browser/dom_ui/shared_resources_data_source.cc',
-        'browser/dom_ui/shared_resources_data_source.h',
-        'browser/dom_ui/shown_sections_handler.cc',
-        'browser/dom_ui/shown_sections_handler.h',
-        'browser/dom_ui/sync_internals_html_source.cc',
-        'browser/dom_ui/sync_internals_html_source.h',
-        'browser/dom_ui/sync_internals_ui.cc',
-        'browser/dom_ui/sync_internals_ui.h',
-        'browser/dom_ui/textfields_ui.cc',
-        'browser/dom_ui/textfields_ui.h',
-        'browser/dom_ui/tips_handler.cc',
-        'browser/dom_ui/tips_handler.h',
-        'browser/dom_ui/value_helper.cc',
-        'browser/dom_ui/value_helper.h',
-        'browser/dom_ui/web_ui_favicon_source.cc',
-        'browser/dom_ui/web_ui_favicon_source.h',
-        'browser/dom_ui/web_ui_screenshot_source.cc',
-        'browser/dom_ui/web_ui_screenshot_source.h',
-        'browser/dom_ui/web_ui_theme_source.cc',
-        'browser/dom_ui/web_ui_theme_source.h',
-        'browser/dom_ui/web_ui_thumbnail_source.cc',
-        'browser/dom_ui/web_ui_thumbnail_source.h',
         'browser/download/base_file.cc',
         'browser/download/base_file.h',
         'browser/download/download_extensions.cc',
@@ -3406,8 +3368,18 @@
         'browser/webui/keyboard_ui.h',
         'browser/webui/mediaplayer_ui.cc',
         'browser/webui/mediaplayer_ui.h',
+        'browser/webui/most_visited_handler.cc',
+        'browser/webui/most_visited_handler.h',
         'browser/webui/net_internals_ui.cc',
         'browser/webui/net_internals_ui.h',
+        'browser/webui/new_tab_page_sync_handler.cc',
+        'browser/webui/new_tab_page_sync_handler.h',
+        'browser/webui/new_tab_ui.cc',
+        'browser/webui/new_tab_ui.h',
+        'browser/webui/ntp_login_handler.cc',
+        'browser/webui/ntp_login_handler.h',
+        'browser/webui/ntp_resource_cache.cc',
+        'browser/webui/ntp_resource_cache.h',
         'browser/webui/options/about_page_handler.cc',
         'browser/webui/options/about_page_handler.h',
         'browser/webui/options/add_startup_page_handler.cc',
@@ -3460,14 +3432,42 @@
         'browser/webui/options/stop_syncing_handler.h',
         'browser/webui/plugins_ui.cc',
         'browser/webui/plugins_ui.h',
+        'browser/webui/print_preview_handler.cc',
+        'browser/webui/print_preview_handler.h',
+        'browser/webui/print_preview_ui.cc',
+        'browser/webui/print_preview_ui.h',
+        'browser/webui/print_preview_ui_html_source.cc',
+        'browser/webui/print_preview_ui_html_source.h',
         'browser/webui/remoting_ui.cc',
         'browser/webui/remoting_ui.h',
+        'browser/webui/shared_resources_data_source.cc',
+        'browser/webui/shared_resources_data_source.h',
+        'browser/webui/shown_sections_handler.cc',
+        'browser/webui/shown_sections_handler.h',
         'browser/webui/slideshow_ui.cc',
         'browser/webui/slideshow_ui.h',
+        'browser/webui/sync_internals_html_source.cc',
+        'browser/webui/sync_internals_html_source.h',
+        'browser/webui/sync_internals_ui.cc',
+        'browser/webui/sync_internals_ui.h',
+        'browser/webui/textfields_ui.cc',
+        'browser/webui/textfields_ui.h',
+        'browser/webui/tips_handler.cc',
+        'browser/webui/tips_handler.h',
+        'browser/webui/value_helper.cc',
+        'browser/webui/value_helper.h',
         'browser/webui/web_ui.cc',
         'browser/webui/web_ui.h',
         'browser/webui/web_ui_factory.cc',
         'browser/webui/web_ui_factory.h',
+        'browser/webui/web_ui_favicon_source.cc',
+        'browser/webui/web_ui_favicon_source.h',
+        'browser/webui/web_ui_screenshot_source.cc',
+        'browser/webui/web_ui_screenshot_source.h',
+        'browser/webui/web_ui_theme_source.cc',
+        'browser/webui/web_ui_theme_source.h',
+        'browser/webui/web_ui_thumbnail_source.cc',
+        'browser/webui/web_ui_thumbnail_source.h',
         'browser/webui/web_ui_util.cc',
         'browser/webui/web_ui_util.h',
         'browser/worker_host/message_port_service.cc',
@@ -3497,7 +3497,7 @@
         ['chromeos==0', {
           'sources/': [
             ['exclude', '^browser/chromeos'],
-            ['exclude', 'browser/dom_ui/chrome_about_ui.cc'],
+            ['exclude', 'browser/webui/chrome_about_ui.cc'],
             ['exclude', 'browser/extensions/extension_tts_api_chromeos.cc'],
             ['exclude', 'browser/oom_priority_manager.cc'],
             ['exclude', 'browser/oom_priority_manager.h'],
@@ -3537,8 +3537,8 @@
         }],
         ['touchui==0', {
           'sources/': [
-            ['exclude', '^browser/chromeos/dom_ui/login/'],
-            ['exclude', '^browser/dom_ui/keyboard_ui.*'],
+            ['exclude', '^browser/chromeos/webui/login/'],
+            ['exclude', '^browser/webui/keyboard_ui.*'],
             ['exclude', '^browser/renderer_host/render_widget_host_view_views.*'],
             ['exclude', '^browser/ui/touch/*'],
             ['exclude', '^browser/ui/views/tab_contents/tab_contents_container_views.cc'],
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 61bb976..67160b1 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -549,8 +549,6 @@
         'app/chrome_main_uitest.cc',
         'browser/appcache/appcache_ui_test.cc',
         'browser/browser_encoding_uitest.cc',
-        'browser/dom_ui/new_tab_ui_uitest.cc',
-        'browser/dom_ui/print_preview_ui_uitest.cc',
         'browser/download/download_uitest.cc',
         'browser/download/save_page_uitest.cc',
         'browser/errorpage_uitest.cc',
@@ -579,7 +577,9 @@
         'browser/ui/tests/browser_uitest.cc',
         'browser/ui/views/find_bar_host_uitest.cc',
         'browser/webui/bookmarks_ui_uitest.cc',
+        'browser/webui/new_tab_ui_uitest.cc',
         'browser/webui/options/options_ui_uitest.cc',
+        'browser/webui/print_preview_ui_uitest.cc',
         'common/logging_chrome_uitest.cc',
         'renderer/external_extension_uitest.cc',
         'test/automation/automation_proxy_uitest.cc',
@@ -692,7 +692,7 @@
         ['chromeos==1', {
           'sources!': [
               # TODO(thestig): Enable when print preview is ready for CrOS.
-             'browser/dom_ui/print_preview_ui_uitest.cc',
+             'browser/webui/print_preview_ui_uitest.cc',
           ],
         }],
       ],
@@ -1263,11 +1263,6 @@
         'browser/cookies_tree_model_unittest.cc',
         'browser/debugger/devtools_manager_unittest.cc',
         'browser/device_orientation/provider_unittest.cc',
-        'browser/dom_ui/html_dialog_tab_contents_delegate_unittest.cc',
-        'browser/dom_ui/print_preview_ui_html_source_unittest.cc',
-        'browser/dom_ui/shown_sections_handler_unittest.cc',
-        'browser/dom_ui/sync_internals_ui_unittest.cc',
-        'browser/dom_ui/web_ui_theme_source_unittest.cc',
         'browser/download/base_file_unittest.cc',
         'browser/download/download_file_unittest.cc',
         'browser/download/download_manager_unittest.cc',
@@ -1745,7 +1740,12 @@
         'browser/webdata/web_data_service_test_util.h',
         'browser/webdata/web_data_service_unittest.cc',
         'browser/webdata/web_database_unittest.cc',
+        'browser/webui/html_dialog_tab_contents_delegate_unittest.cc',
         'browser/webui/options/language_options_handler_unittest.cc',
+        'browser/webui/print_preview_ui_html_source_unittest.cc',
+        'browser/webui/shown_sections_handler_unittest.cc',
+        'browser/webui/sync_internals_ui_unittest.cc',
+        'browser/webui/web_ui_theme_source_unittest.cc',
         'browser/webui/web_ui_unittest.cc',
         'browser/web_resource/promo_resource_service_unittest.cc',
         'common/bzip2_unittest.cc',
@@ -1870,15 +1870,15 @@
           ],
         }, { # else: touchui == 0
           'sources/': [
-            ['exclude', '^browser/chromeos/dom_ui/login/'],
+            ['exclude', '^browser/chromeos/webui/login/'],
           ],
         }],
         ['chromeos==1', {
           'sources/': [
             # TODO(thestig) Enable PrintPreviewUIHTMLSource tests on CrOS when
             # print preview is enabled on CrOS.
-            ['exclude', 'browser/dom_ui/print_preview_ui_html_source_unittest.cc'],
             ['exclude', 'browser/notifications/desktop_notifications_unittest.cc'],
+            ['exclude', 'browser/webui/print_preview_ui_html_source_unittest.cc'],
           ],
         }, { # else: chromeos == 0
           'sources/': [
@@ -2171,13 +2171,6 @@
         'browser/chromeos/update_browsertest.cc',
         'browser/crash_recovery_browsertest.cc',
         'browser/device_orientation/device_orientation_browsertest.cc',
-        'browser/dom_ui/web_ui_browsertest.cc',
-        'browser/dom_ui/web_ui_browsertest.h',
-        'browser/dom_ui/web_ui_handler_browsertest.cc',
-        'browser/dom_ui/web_ui_handler_browsertest.h',
-        'browser/dom_ui/file_browse_browsertest.cc',
-        'browser/dom_ui/mediaplayer_browsertest.cc',
-        'browser/dom_ui/settings_browsertest.cc',
         'browser/download/download_browsertest.cc',
         'browser/download/save_page_browsertest.cc',
         'browser/extensions/alert_apitest.cc',
@@ -2302,6 +2295,13 @@
         'browser/ui/views/browser_actions_container_browsertest.cc',
         'browser/ui/views/dom_view_browsertest.cc',
         'browser/ui/views/html_dialog_view_browsertest.cc',
+        'browser/webui/web_ui_browsertest.cc',
+        'browser/webui/web_ui_browsertest.h',
+        'browser/webui/web_ui_handler_browsertest.cc',
+        'browser/webui/web_ui_handler_browsertest.h',
+        'browser/webui/file_browse_browsertest.cc',
+        'browser/webui/mediaplayer_browsertest.cc',
+        'browser/webui/settings_browsertest.cc',
         'renderer/autofill/form_autocomplete_browsertest.cc',
         'renderer/autofill/form_manager_browsertest.cc',
         'renderer/autofill/password_autofill_manager_unittest.cc',
@@ -2332,8 +2332,8 @@
             ['exclude', '^browser/chromeos'],
           ],
           'sources!': [
-            'browser/dom_ui/mediaplayer_browsertest.cc',
-            'browser/dom_ui/file_browse_browsertest.cc',
+            'browser/webui/file_browse_browsertest.cc',
+            'browser/webui/mediaplayer_browsertest.cc',
           ],
         }],
         ['toolkit_views==0', {
@@ -2413,7 +2413,7 @@
           ],
           'sources': [
             # TODO(estade): port to win/mac.
-            'browser/dom_ui/constrained_html_ui_browsertest.cc',
+            'browser/webui/constrained_html_ui_browsertest.cc',
           ],
         }],
         ['OS=="mac"', {
@@ -2458,7 +2458,7 @@
           ],
           'sources!': [
             # TODO(estade): port to linux/views.
-            'browser/dom_ui/constrained_html_ui_browsertest.cc',
+            'browser/webui/constrained_html_ui_browsertest.cc',
           ],
         }, { # else: toolkit_views == 0
           'sources!': [
diff --git a/chrome/common/notification_type.h b/chrome/common/notification_type.h
index ca41f91..094f2d7 100644
--- a/chrome/common/notification_type.h
+++ b/chrome/common/notification_type.h
@@ -1147,7 +1147,7 @@ class NotificationType {
     FOREIGN_SESSION_DISABLED,
 
     // Sent when the set of data types that should be synced has been modified
-    // externally (eg. by the dom_ui options screen).
+    // externally (eg. by the WebUI options screen).
     // The source is the Profile, there are no details.
     SYNC_DATA_TYPES_UPDATED,
 
diff --git a/chrome/test/testing_profile.cc b/chrome/test/testing_profile.cc
index 8e4a009..7eee1fe 100644
--- a/chrome/test/testing_profile.cc
+++ b/chrome/test/testing_profile.cc
@@ -16,7 +16,6 @@
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
-#include "chrome/browser/dom_ui/ntp_resource_cache.h"
 #include "chrome/browser/extensions/extension_pref_value_map.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/favicon_service.h"
@@ -38,6 +37,7 @@
 #include "chrome/browser/themes/browser_theme_provider.h"
 #include "chrome/browser/ui/find_bar/find_bar_state.h"
 #include "chrome/browser/webui/chrome_url_data_manager.h"
+#include "chrome/browser/webui/ntp_resource_cache.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/net/url_request_context_getter.h"
 #include "chrome/common/notification_service.h"