WebUI: Move more files from chrome/browser/dom_ui to chrome/browser/webui. Part 5.

BUG=59945, 59946 TEST=trybots Review URL: http://codereview.chromium.org/6538053 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75453 0039d316-1c4b-4281-b951-d872f2087c98
author: tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> 2011-02-18 22:21:43 +0000
committer: tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> 2011-02-18 22:21:43 +0000
commit: 33d6752e62f1e94c16560e2991ff307033686af0 (patch)
tree: f442c02176fb9057eac8c52d5b5367f28dbb7996
parent: 71893bf4539fe2d65cfc3fc2e0f532a31db9f76a (diff)
download: chromium_src-33d6752e62f1e94c16560e2991ff307033686af0.zip
chromium_src-33d6752e62f1e94c16560e2991ff307033686af0.tar.gz
chromium_src-33d6752e62f1e94c16560e2991ff307033686af0.tar.bz2
104 files changed, 209 insertions, 204 deletions
diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc
index e4ff802..e9ec1e7 100644
--- a/chrome/browser/browser_about_handler.cc
+++ b/chrome/browser/browser_about_handler.cc
@@ -16,10 +16,10 @@
 #include "base/metrics/stats_table.h"
 #include "base/path_service.h"
 #include "base/singleton.h"
-#include "base/stringprintf.h"
 #include "base/string_number_conversions.h"
 #include "base/string_piece.h"
 #include "base/string_util.h"
+#include "base/stringprintf.h"
 #include "base/threading/thread.h"
 #include "base/tracked_objects.h"
 #include "base/utf_string_conversions.h"
@@ -28,7 +28,6 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/defaults.h"
-#include "chrome/browser/dom_ui/chrome_url_data_manager.h"
 #include "chrome/browser/gpu_process_host.h"
 #include "chrome/browser/gpu_process_host_ui_shim.h"
 #include "chrome/browser/memory_details.h"
@@ -40,6 +39,7 @@
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/ui/browser_dialogs.h"
+#include "chrome/browser/webui/chrome_url_data_manager.h"
 #include "chrome/common/about_handler.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_version_info.h"
@@ -53,10 +53,10 @@
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
-#include "webkit/glue/webkit_glue.h"
 #include "net/base/escape.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "webkit/glue/webkit_glue.h"
 #ifdef CHROME_V8
 #include "v8/include/v8.h"
 #endif
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index 75f48af..e5f5729 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -36,7 +36,6 @@
 #include "chrome/browser/browser_process_impl.h"
 #include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/browser_thread.h"
-#include "chrome/browser/dom_ui/chrome_url_data_manager_backend.h"
 #include "chrome/browser/extensions/extension_protocols.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extensions_startup.h"
@@ -73,6 +72,7 @@
 #include "chrome/browser/translate/translate_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_init.h"
+#include "chrome/browser/webui/chrome_url_data_manager_backend.h"
 #include "chrome/common/child_process.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
diff --git a/chrome/browser/browser_shutdown.cc b/chrome/browser/browser_shutdown.cc
index 198a75c..7c14c52 100644
--- a/chrome/browser/browser_shutdown.cc
+++ b/chrome/browser/browser_shutdown.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.
 
@@ -22,7 +22,6 @@
 #include "chrome/browser/about_flags.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_thread.h"
-#include "chrome/browser/dom_ui/chrome_url_data_manager.h"
 #include "chrome/browser/first_run/first_run.h"
 #include "chrome/browser/jankometer.h"
 #include "chrome/browser/metrics/metrics_service.h"
@@ -34,10 +33,11 @@
 #include "chrome/browser/renderer_host/render_widget_host.h"
 #include "chrome/browser/service/service_process_control_manager.h"
 #include "chrome/browser/ui/browser_list.h"
+#include "chrome/browser/webui/chrome_url_data_manager.h"
 #include "chrome/common/chrome_paths.h"
+#include "chrome/common/chrome_plugin_lib.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
-#include "chrome/common/chrome_plugin_lib.h"
 #include "chrome/common/switch_utils.h"
 #include "net/predictor_api.h"
 #include "ui/base/resource/resource_bundle.h"
diff --git a/chrome/browser/browser_signin.cc b/chrome/browser/browser_signin.cc
index a01bfef..815195e1 100644
--- a/chrome/browser/browser_signin.cc
+++ b/chrome/browser/browser_signin.cc
@@ -14,15 +14,15 @@
 #include "base/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/browser_thread.h"
-#include "chrome/browser/dom_ui/chrome_url_data_manager.h"
-#include "chrome/browser/dom_ui/constrained_html_ui.h"
-#include "chrome/browser/dom_ui/html_dialog_ui.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/sync_setup_flow.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/browser/webui/chrome_url_data_manager.h"
+#include "chrome/browser/webui/constrained_html_ui.h"
+#include "chrome/browser/webui/html_dialog_ui.h"
 #include "chrome/browser/webui/web_ui_util.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/notification_details.h"
diff --git a/chrome/browser/chrome_plugin_host.cc b/chrome/browser/chrome_plugin_host.cc
index 2b020d4..da384aa 100644
--- a/chrome/browser/chrome_plugin_host.cc
+++ b/chrome/browser/chrome_plugin_host.cc
@@ -22,12 +22,12 @@
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/chrome_plugin_browsing_context.h"
-#include "chrome/browser/dom_ui/html_dialog_ui.h"
 #include "chrome/browser/gears_integration.h"
 #include "chrome/browser/plugin_process_host.h"
 #include "chrome/browser/plugin_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
+#include "chrome/browser/webui/html_dialog_ui.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_counters.h"
 #include "chrome/common/chrome_paths.h"
diff --git a/chrome/browser/chromeos/login/login_html_dialog.h b/chrome/browser/chromeos/login/login_html_dialog.h
index d1ee19d..4d95756 100644
--- a/chrome/browser/chromeos/login/login_html_dialog.h
+++ b/chrome/browser/chromeos/login/login_html_dialog.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.
 
@@ -8,7 +8,7 @@
 
 #include <string>
 
-#include "chrome/browser/dom_ui/html_dialog_ui.h"
+#include "chrome/browser/webui/html_dialog_ui.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 #include "ui/gfx/native_widget_types.h"
diff --git a/chrome/browser/chromeos/webui/imageburner_ui.h b/chrome/browser/chromeos/webui/imageburner_ui.h
index fc98d7d..e1f1ef20 100644
--- a/chrome/browser/chromeos/webui/imageburner_ui.h
+++ b/chrome/browser/chromeos/webui/imageburner_ui.h
@@ -17,10 +17,10 @@
 #include "chrome/browser/chromeos/cros/burn_library.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/mount_library.h"
-#include "chrome/browser/dom_ui/chrome_url_data_manager.h"
 #include "chrome/browser/download/download_item.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/download/download_util.h"
+#include "chrome/browser/webui/chrome_url_data_manager.h"
 #include "chrome/browser/webui/web_ui.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/file_stream.h"
diff --git a/chrome/browser/chromeos/webui/keyboard_overlay_ui.cc b/chrome/browser/chromeos/webui/keyboard_overlay_ui.cc
index d2cf24b..4136c1e 100644
--- a/chrome/browser/chromeos/webui/keyboard_overlay_ui.cc
+++ b/chrome/browser/chromeos/webui/keyboard_overlay_ui.cc
@@ -11,9 +11,9 @@
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/input_method_library.h"
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
-#include "chrome/browser/dom_ui/chrome_url_data_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/browser/webui/chrome_url_data_manager.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/url_constants.h"
 #include "grit/browser_resources.h"
diff --git a/chrome/browser/chromeos/webui/keyboard_overlay_ui.h b/chrome/browser/chromeos/webui/keyboard_overlay_ui.h
index 42d5fd99..8cb062f 100644
--- a/chrome/browser/chromeos/webui/keyboard_overlay_ui.h
+++ b/chrome/browser/chromeos/webui/keyboard_overlay_ui.h
@@ -8,7 +8,7 @@
 
 #include <string>
 
-#include "chrome/browser/dom_ui/html_dialog_ui.h"
+#include "chrome/browser/webui/html_dialog_ui.h"
 
 class Browser;
 class Profile;
diff --git a/chrome/browser/chromeos/webui/login/login_ui.cc b/chrome/browser/chromeos/webui/login/login_ui.cc
index d9a3371..7c03804 100644
--- a/chrome/browser/chromeos/webui/login/login_ui.cc
+++ b/chrome/browser/chromeos/webui/login/login_ui.cc
@@ -14,11 +14,11 @@
 #include "chrome/browser/chromeos/webui/login/authenticator_facade_cros.h"
 #include "chrome/browser/chromeos/webui/login/login_ui.h"
 #include "chrome/browser/chromeos/webui/login/login_ui_helpers.h"
-#include "chrome/browser/dom_ui/chrome_url_data_manager.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_window.h"
+#include "chrome/browser/webui/chrome_url_data_manager.h"
 #include "chrome/common/url_constants.h"
 
 namespace chromeos {
diff --git a/chrome/browser/chromeos/webui/login/login_ui.h b/chrome/browser/chromeos/webui/login/login_ui.h
index 094692a..58f09bf 100644
--- a/chrome/browser/chromeos/webui/login/login_ui.h
+++ b/chrome/browser/chromeos/webui/login/login_ui.h
@@ -10,7 +10,7 @@
 
 #include "base/scoped_ptr.h"
 #include "chrome/browser/chromeos/login/login_status_consumer.h"
-#include "chrome/browser/dom_ui/chrome_url_data_manager.h"
+#include "chrome/browser/webui/chrome_url_data_manager.h"
 #include "chrome/browser/webui/web_ui.h"
 
 class Profile;
diff --git a/chrome/browser/chromeos/webui/menu_ui.h b/chrome/browser/chromeos/webui/menu_ui.h
index 0cf8be5..b32e1b6 100644
--- a/chrome/browser/chromeos/webui/menu_ui.h
+++ b/chrome/browser/chromeos/webui/menu_ui.h
@@ -8,7 +8,7 @@
 
 #include <string>
 
-#include "chrome/browser/dom_ui/chrome_url_data_manager.h"
+#include "chrome/browser/webui/chrome_url_data_manager.h"
 #include "chrome/browser/webui/web_ui.h"
 
 class DictionaryValue;
diff --git a/chrome/browser/chromeos/webui/mobile_setup_ui.cc b/chrome/browser/chromeos/webui/mobile_setup_ui.cc
index 642f95e..bce623c 100644
--- a/chrome/browser/chromeos/webui/mobile_setup_ui.cc
+++ b/chrome/browser/chromeos/webui/mobile_setup_ui.cc
@@ -16,9 +16,9 @@
 #include "base/metrics/histogram.h"
 #include "base/string_piece.h"
 #include "base/string_util.h"
-#include "base/utf_string_conversions.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/timer.h"
+#include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "base/weak_ptr.h"
 #include "chrome/browser/browser_list.h"
@@ -26,10 +26,10 @@
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/cros/system_library.h"
-#include "chrome/browser/dom_ui/chrome_url_data_manager.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/browser/webui/chrome_url_data_manager.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
diff --git a/chrome/browser/chromeos/webui/register_page_ui.cc b/chrome/browser/chromeos/webui/register_page_ui.cc
index 5f22f91..f0dbefc 100644
--- a/chrome/browser/chromeos/webui/register_page_ui.cc
+++ b/chrome/browser/chromeos/webui/register_page_ui.cc
@@ -20,9 +20,9 @@
 #include "chrome/browser/chromeos/customization_document.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/chromeos/version_loader.h"
-#include "chrome/browser/dom_ui/chrome_url_data_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/browser/webui/chrome_url_data_manager.h"
 #include "chrome/common/url_constants.h"
 #include "googleurl/src/gurl.h"
 #include "grit/browser_resources.h"
diff --git a/chrome/browser/chromeos/webui/system_info_ui.cc b/chrome/browser/chromeos/webui/system_info_ui.cc
index 19fa172..04e3a9c 100644
--- a/chrome/browser/chromeos/webui/system_info_ui.cc
+++ b/chrome/browser/chromeos/webui/system_info_ui.cc
@@ -17,18 +17,18 @@
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/syslogs_library.h"
-#include "chrome/browser/dom_ui/chrome_url_data_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/browser/webui/chrome_url_data_manager.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/url_constants.h"
-#include "net/base/escape.h"
-#include "net/base/directory_lister.h"
 #include "grit/browser_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
+#include "net/base/directory_lister.h"
+#include "net/base/escape.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
diff --git a/chrome/browser/dom_ui/constrained_html_ui_browsertest.cc b/chrome/browser/dom_ui/constrained_html_ui_browsertest.cc
index a0221ae..6be6693 100644
--- a/chrome/browser/dom_ui/constrained_html_ui_browsertest.cc
+++ b/chrome/browser/dom_ui/constrained_html_ui_browsertest.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.
 
@@ -6,15 +6,15 @@
 
 #include "base/file_path.h"
 #include "base/message_loop.h"
-#include "chrome/browser/dom_ui/constrained_html_ui.h"
-#include "chrome/browser/dom_ui/html_dialog_ui.h"
 #include "chrome/browser/renderer_host/render_widget_host_view.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/browser/webui/constrained_html_ui.h"
+#include "chrome/browser/webui/html_dialog_ui.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/in_process_browser_test.h"
 #include "chrome/test/ui_test_utils.h"
-#include "testing/gtest/include/gtest/gtest.h"
 #include "testing/gmock/include/gmock/gmock.h"
+#include "testing/gtest/include/gtest/gtest.h"
 
 using testing::Eq;
 
diff --git a/chrome/browser/dom_ui/html_dialog_tab_contents_delegate_unittest.cc b/chrome/browser/dom_ui/html_dialog_tab_contents_delegate_unittest.cc
index e1c7f34..58da688 100644
--- a/chrome/browser/dom_ui/html_dialog_tab_contents_delegate_unittest.cc
+++ b/chrome/browser/dom_ui/html_dialog_tab_contents_delegate_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/dom_ui/html_dialog_tab_contents_delegate.h"
+#include "chrome/browser/webui/html_dialog_tab_contents_delegate.h"
 
 #include <vector>
 
diff --git a/chrome/browser/dom_ui/most_visited_handler.cc b/chrome/browser/dom_ui/most_visited_handler.cc
index 6c762f4..e5291e9 100644
--- a/chrome/browser/dom_ui/most_visited_handler.cc
+++ b/chrome/browser/dom_ui/most_visited_handler.cc
@@ -9,15 +9,14 @@
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/md5.h"
-#include "base/singleton.h"
 #include "base/scoped_vector.h"
+#include "base/singleton.h"
 #include "base/string16.h"
 #include "base/string_number_conversions.h"
-#include "base/utf_string_conversions.h"
 #include "base/threading/thread.h"
+#include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_thread.h"
-#include "chrome/browser/dom_ui/chrome_url_data_manager.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"
@@ -26,8 +25,9 @@
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/common/notification_type.h"
+#include "chrome/browser/webui/chrome_url_data_manager.h"
 #include "chrome/common/notification_source.h"
+#include "chrome/common/notification_type.h"
 #include "chrome/common/pref_names.h"
 #include "googleurl/src/gurl.h"
 #include "grit/chromium_strings.h"
diff --git a/chrome/browser/dom_ui/new_tab_ui.cc b/chrome/browser/dom_ui/new_tab_ui.cc
index 9439871..6594e1c 100644
--- a/chrome/browser/dom_ui/new_tab_ui.cc
+++ b/chrome/browser/dom_ui/new_tab_ui.cc
@@ -17,8 +17,6 @@
 #include "base/threading/thread.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_thread.h"
-#include "chrome/browser/dom_ui/app_launcher_handler.h"
-#include "chrome/browser/dom_ui/foreign_session_handler.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"
@@ -28,7 +26,6 @@
 #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/themes/browser_theme_provider.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
@@ -37,7 +34,10 @@
 #include "chrome/browser/sessions/tab_restore_service_observer.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/browser/themes/browser_theme_provider.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/webui/app_launcher_handler.h"
+#include "chrome/browser/webui/foreign_session_handler.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/dom_ui/new_tab_ui.h
index 30acb50..e513dc2 100644
--- a/chrome/browser/dom_ui/new_tab_ui.h
+++ b/chrome/browser/dom_ui/new_tab_ui.h
@@ -10,8 +10,8 @@
 
 #include "base/gtest_prod_util.h"
 #include "base/timer.h"
-#include "chrome/browser/dom_ui/chrome_url_data_manager.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
+#include "chrome/browser/webui/chrome_url_data_manager.h"
 #include "chrome/browser/webui/web_ui.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
diff --git a/chrome/browser/dom_ui/ntp_resource_cache.cc b/chrome/browser/dom_ui/ntp_resource_cache.cc
index 29fcbe4..6803f0a 100644
--- a/chrome/browser/dom_ui/ntp_resource_cache.cc
+++ b/chrome/browser/dom_ui/ntp_resource_cache.cc
@@ -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/chrome_url_data_manager.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/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
diff --git a/chrome/browser/dom_ui/options/options_ui.h b/chrome/browser/dom_ui/options/options_ui.h
index 74bf96a..84928d7 100644
--- a/chrome/browser/dom_ui/options/options_ui.h
+++ b/chrome/browser/dom_ui/options/options_ui.h
@@ -9,7 +9,7 @@
 #include <string>
 
 #include "base/scoped_ptr.h"
-#include "chrome/browser/dom_ui/chrome_url_data_manager.h"
+#include "chrome/browser/webui/chrome_url_data_manager.h"
 #include "chrome/browser/webui/web_ui.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
diff --git a/chrome/browser/dom_ui/print_preview_ui_html_source.h b/chrome/browser/dom_ui/print_preview_ui_html_source.h
index 6b6f42e..7950ed4 100644
--- a/chrome/browser/dom_ui/print_preview_ui_html_source.h
+++ b/chrome/browser/dom_ui/print_preview_ui_html_source.h
@@ -9,7 +9,7 @@
 #include <string>
 #include <utility>
 
-#include "chrome/browser/dom_ui/chrome_url_data_manager.h"
+#include "chrome/browser/webui/chrome_url_data_manager.h"
 
 namespace base {
 class SharedMemory;
diff --git a/chrome/browser/dom_ui/shared_resources_data_source.cc b/chrome/browser/dom_ui/shared_resources_data_source.cc
index 167a67a..aac3896 100644
--- a/chrome/browser/dom_ui/shared_resources_data_source.cc
+++ b/chrome/browser/dom_ui/shared_resources_data_source.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.
 
@@ -9,13 +9,13 @@
 #include "base/singleton.h"
 #include "base/threading/thread_restrictions.h"
 #include "chrome/browser/browser_thread.h"
-#include "chrome/browser/dom_ui/chrome_url_data_manager.h"
 #include "chrome/browser/io_thread.h"
+#include "chrome/browser/webui/chrome_url_data_manager.h"
 #include "chrome/common/url_constants.h"
+#include "grit/app_resources.h"
 #include "grit/generated_resources.h"
 #include "grit/shared_resources.h"
 #include "grit/shared_resources_map.h"
-#include "grit/app_resources.h"
 #include "grit/theme_resources.h"
 #include "net/base/mime_util.h"
 #include "ui/base/resource/resource_bundle.h"
diff --git a/chrome/browser/dom_ui/shared_resources_data_source.h b/chrome/browser/dom_ui/shared_resources_data_source.h
index 1aec881..90be057 100644
--- a/chrome/browser/dom_ui/shared_resources_data_source.h
+++ b/chrome/browser/dom_ui/shared_resources_data_source.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.
 
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_DOM_UI_SHARED_RESOURCES_DATA_SOURCE_H_
 #pragma once
 
-#include "chrome/browser/dom_ui/chrome_url_data_manager.h"
+#include "chrome/browser/webui/chrome_url_data_manager.h"
 
 namespace net {
 class URLRequest;
diff --git a/chrome/browser/dom_ui/sync_internals_html_source.h b/chrome/browser/dom_ui/sync_internals_html_source.h
index bb8ab48..969a11a 100644
--- a/chrome/browser/dom_ui/sync_internals_html_source.h
+++ b/chrome/browser/dom_ui/sync_internals_html_source.h
@@ -9,7 +9,7 @@
 #include <string>
 
 #include "base/basictypes.h"
-#include "chrome/browser/dom_ui/chrome_url_data_manager.h"
+#include "chrome/browser/webui/chrome_url_data_manager.h"
 
 class SyncInternalsHTMLSource : public ChromeURLDataManager::DataSource {
  public:
diff --git a/chrome/browser/dom_ui/sync_internals_ui.cc b/chrome/browser/dom_ui/sync_internals_ui.cc
index 3cfbdcd..fd81d8b 100644
--- a/chrome/browser/dom_ui/sync_internals_ui.cc
+++ b/chrome/browser/dom_ui/sync_internals_ui.cc
@@ -12,13 +12,13 @@
 #include "base/tracked_objects.h"
 #include "base/values.h"
 #include "chrome/browser/browser_thread.h"
-#include "chrome/browser/dom_ui/chrome_url_data_manager.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/common/render_messages_params.h"
 
 SyncInternalsUI::SyncInternalsUI(TabContents* contents)
diff --git a/chrome/browser/dom_ui/textfields_ui.h b/chrome/browser/dom_ui/textfields_ui.h
index 647aca5..145ec69 100644
--- a/chrome/browser/dom_ui/textfields_ui.h
+++ b/chrome/browser/dom_ui/textfields_ui.h
@@ -8,7 +8,7 @@
 
 #include <string>
 
-#include "chrome/browser/dom_ui/chrome_url_data_manager.h"
+#include "chrome/browser/webui/chrome_url_data_manager.h"
 #include "chrome/browser/webui/web_ui.h"
 
 class RefCountedMemory;
diff --git a/chrome/browser/dom_ui/web_ui_favicon_source.h b/chrome/browser/dom_ui/web_ui_favicon_source.h
index 71f8cde..1808128 100644
--- a/chrome/browser/dom_ui/web_ui_favicon_source.h
+++ b/chrome/browser/dom_ui/web_ui_favicon_source.h
@@ -10,8 +10,8 @@
 
 #include "base/basictypes.h"
 #include "base/ref_counted.h"
-#include "chrome/browser/dom_ui/chrome_url_data_manager.h"
 #include "chrome/browser/favicon_service.h"
+#include "chrome/browser/webui/chrome_url_data_manager.h"
 
 class GURL;
 class Profile;
diff --git a/chrome/browser/dom_ui/web_ui_screenshot_source.h b/chrome/browser/dom_ui/web_ui_screenshot_source.h
index bc88a02..e5955c0f 100644
--- a/chrome/browser/dom_ui/web_ui_screenshot_source.h
+++ b/chrome/browser/dom_ui/web_ui_screenshot_source.h
@@ -9,7 +9,7 @@
 #include <vector>
 
 #include "base/basictypes.h"
-#include "chrome/browser/dom_ui/chrome_url_data_manager.h"
+#include "chrome/browser/webui/chrome_url_data_manager.h"
 
 // ScreenshotSource is the data source that serves screenshots (saved
 // or current) to the bug report html ui
diff --git a/chrome/browser/dom_ui/web_ui_theme_source.h b/chrome/browser/dom_ui/web_ui_theme_source.h
index 4a7e2ed..2b66635 100644
--- a/chrome/browser/dom_ui/web_ui_theme_source.h
+++ b/chrome/browser/dom_ui/web_ui_theme_source.h
@@ -8,7 +8,7 @@
 
 #include <string>
 
-#include "chrome/browser/dom_ui/chrome_url_data_manager.h"
+#include "chrome/browser/webui/chrome_url_data_manager.h"
 
 class Profile;
 class RefCountedBytes;
diff --git a/chrome/browser/dom_ui/web_ui_thumbnail_source.h b/chrome/browser/dom_ui/web_ui_thumbnail_source.h
index 7891fe2..82dd36d 100644
--- a/chrome/browser/dom_ui/web_ui_thumbnail_source.h
+++ b/chrome/browser/dom_ui/web_ui_thumbnail_source.h
@@ -11,7 +11,7 @@
 #include "base/basictypes.h"
 #include "base/ref_counted.h"
 #include "base/ref_counted_memory.h"
-#include "chrome/browser/dom_ui/chrome_url_data_manager.h"
+#include "chrome/browser/webui/chrome_url_data_manager.h"
 
 class Profile;
 
diff --git a/chrome/browser/extensions/extension_bookmark_manager_api.cc b/chrome/browser/extensions/extension_bookmark_manager_api.cc
index 074f69f..bef87cd 100644
--- a/chrome/browser/extensions/extension_bookmark_manager_api.cc
+++ b/chrome/browser/extensions/extension_bookmark_manager_api.cc
@@ -9,10 +9,9 @@
 #include "base/json/json_writer.h"
 #include "base/string_number_conversions.h"
 #include "base/values.h"
-#include "chrome/browser/bookmarks/bookmark_node_data.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
+#include "chrome/browser/bookmarks/bookmark_node_data.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
-#include "chrome/browser/dom_ui/chrome_url_data_manager.h"
 #include "chrome/browser/extensions/extension_bookmark_helpers.h"
 #include "chrome/browser/extensions/extension_bookmarks_module_constants.h"
 #include "chrome/browser/extensions/extension_event_router.h"
@@ -20,6 +19,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/browser/webui/chrome_url_data_manager.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
diff --git a/chrome/browser/extensions/extension_function_dispatcher.cc b/chrome/browser/extensions/extension_function_dispatcher.cc
index 3d6a965..4f69361 100644
--- a/chrome/browser/extensions/extension_function_dispatcher.cc
+++ b/chrome/browser/extensions/extension_function_dispatcher.cc
@@ -7,15 +7,13 @@
 #include <map>
 
 #include "base/process_util.h"
-#include "base/singleton.h"
 #include "base/ref_counted.h"
+#include "base/singleton.h"
 #include "base/values.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_window.h"
-#include "chrome/browser/dom_ui/chrome_url_data_manager.h"
 #include "chrome/browser/dom_ui/web_ui_favicon_source.h"
-#include "chrome/browser/external_protocol_handler.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"
@@ -26,8 +24,8 @@
 #include "chrome/browser/extensions/extension_cookies_api.h"
 #include "chrome/browser/extensions/extension_function.h"
 #include "chrome/browser/extensions/extension_history_api.h"
-#include "chrome/browser/extensions/extension_idle_api.h"
 #include "chrome/browser/extensions/extension_i18n_api.h"
+#include "chrome/browser/extensions/extension_idle_api.h"
 #include "chrome/browser/extensions/extension_infobar_module.h"
 #include "chrome/browser/extensions/extension_management_api.h"
 #include "chrome/browser/extensions/extension_message_service.h"
@@ -39,6 +37,7 @@
 #include "chrome/browser/extensions/extension_processes_api.h"
 #include "chrome/browser/extensions/extension_proxy_api.h"
 #include "chrome/browser/extensions/extension_rlz_module.h"
+#include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_sidebar_api.h"
 #include "chrome/browser/extensions/extension_tabs_module.h"
 #include "chrome/browser/extensions/extension_test_api.h"
@@ -47,11 +46,12 @@
 #include "chrome/browser/extensions/extension_webrequest_api.h"
 #include "chrome/browser/extensions/extension_webstore_private_api.h"
 #include "chrome/browser/extensions/extensions_quota_service.h"
-#include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/external_protocol_handler.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/profiles/profile.h"
 #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/common/notification_service.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/render_messages_params.h"
diff --git a/chrome/browser/extensions/extensions_ui.h b/chrome/browser/extensions/extensions_ui.h
index eb75441..5874f4c 100644
--- a/chrome/browser/extensions/extensions_ui.h
+++ b/chrome/browser/extensions/extensions_ui.h
@@ -10,10 +10,10 @@
 #include <vector>
 
 #include "base/scoped_ptr.h"
-#include "chrome/browser/dom_ui/chrome_url_data_manager.h"
 #include "chrome/browser/extensions/extension_install_ui.h"
 #include "chrome/browser/extensions/pack_extension_job.h"
 #include "chrome/browser/ui/shell_dialogs.h"
+#include "chrome/browser/webui/chrome_url_data_manager.h"
 #include "chrome/browser/webui/web_ui.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "chrome/common/notification_observer.h"
diff --git a/chrome/browser/modal_html_dialog_delegate.h b/chrome/browser/modal_html_dialog_delegate.h
index 02116a1..822d337 100644
--- a/chrome/browser/modal_html_dialog_delegate.h
+++ b/chrome/browser/modal_html_dialog_delegate.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 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.
 
@@ -8,7 +8,7 @@
 
 #include <vector>
 
-#include "chrome/browser/dom_ui/html_dialog_ui.h"
+#include "chrome/browser/webui/html_dialog_ui.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 
diff --git a/chrome/browser/net/chrome_url_request_context.cc b/chrome/browser/net/chrome_url_request_context.cc
index eead9cd..b93bf09 100644
--- a/chrome/browser/net/chrome_url_request_context.cc
+++ b/chrome/browser/net/chrome_url_request_context.cc
@@ -8,11 +8,11 @@
 #include "base/message_loop_proxy.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_thread.h"
-#include "chrome/browser/dom_ui/chrome_url_data_manager_backend.h"
 #include "chrome/browser/io_thread.h"
 #include "chrome/browser/net/chrome_cookie_policy.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_io_data.h"
+#include "chrome/browser/webui/chrome_url_data_manager_backend.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 #include "net/base/cookie_store.h"
diff --git a/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc b/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc
index 6fe624e..f4a128b 100644
--- a/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc
+++ b/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc
@@ -11,7 +11,6 @@
 #include "base/values.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_thread.h"
-#include "chrome/browser/dom_ui/chrome_url_data_manager.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h"
@@ -26,6 +25,7 @@
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/browser/ui/browser_window.h"
+#include "chrome/browser/webui/chrome_url_data_manager.h"
 #include "chrome/browser/webui/web_ui_util.h"
 #include "chrome/common/net/gaia/gaia_auth_fetcher.h"
 #include "chrome/common/net/gaia/gaia_constants.h"
diff --git a/chrome/browser/printing/cloud_print/cloud_print_setup_flow.h b/chrome/browser/printing/cloud_print/cloud_print_setup_flow.h
index 032fa59..03bf38f 100644
--- a/chrome/browser/printing/cloud_print/cloud_print_setup_flow.h
+++ b/chrome/browser/printing/cloud_print/cloud_print_setup_flow.h
@@ -9,7 +9,7 @@
 #include <vector>
 
 #include "base/time.h"
-#include "chrome/browser/dom_ui/html_dialog_ui.h"
+#include "chrome/browser/webui/html_dialog_ui.h"
 #include "chrome/common/net/gaia/gaia_auth_consumer.h"
 #include "chrome/common/net/gaia/gaia_auth_fetcher.h"
 #include "grit/generated_resources.h"
diff --git a/chrome/browser/printing/cloud_print/cloud_print_setup_message_handler.h b/chrome/browser/printing/cloud_print/cloud_print_setup_message_handler.h
index 1dabefe..79b38d3f 100644
--- a/chrome/browser/printing/cloud_print/cloud_print_setup_message_handler.h
+++ b/chrome/browser/printing/cloud_print/cloud_print_setup_message_handler.h
@@ -8,7 +8,7 @@
 #include <string>
 
 #include "base/values.h"
-#include "chrome/browser/dom_ui/html_dialog_ui.h"
+#include "chrome/browser/webui/html_dialog_ui.h"
 
 class CloudPrintSetupFlow;
 
diff --git a/chrome/browser/printing/cloud_print/cloud_print_setup_source.h b/chrome/browser/printing/cloud_print/cloud_print_setup_source.h
index 7050c5e..708a6c0 100644
--- a/chrome/browser/printing/cloud_print/cloud_print_setup_source.h
+++ b/chrome/browser/printing/cloud_print/cloud_print_setup_source.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.
 
@@ -8,7 +8,7 @@
 #include <string>
 
 #include "base/message_loop.h"
-#include "chrome/browser/dom_ui/chrome_url_data_manager.h"
+#include "chrome/browser/webui/chrome_url_data_manager.h"
 #include "chrome/common/url_constants.h"
 
 class CloudPrintSetupSource : public ChromeURLDataManager::DataSource {
diff --git a/chrome/browser/printing/print_dialog_cloud_internal.h b/chrome/browser/printing/print_dialog_cloud_internal.h
index 6427f3c..91612ae 100644
--- a/chrome/browser/printing/print_dialog_cloud_internal.h
+++ b/chrome/browser/printing/print_dialog_cloud_internal.h
@@ -12,7 +12,7 @@
 #include "base/file_path.h"
 #include "base/scoped_ptr.h"
 #include "base/synchronization/lock.h"
-#include "chrome/browser/dom_ui/html_dialog_ui.h"
+#include "chrome/browser/webui/html_dialog_ui.h"
 #include "chrome/browser/webui/web_ui.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
diff --git a/chrome/browser/printing/print_dialog_cloud_uitest.cc b/chrome/browser/printing/print_dialog_cloud_uitest.cc
index caced65..248c44f 100644
--- a/chrome/browser/printing/print_dialog_cloud_uitest.cc
+++ b/chrome/browser/printing/print_dialog_cloud_uitest.cc
@@ -16,10 +16,10 @@
 #include "base/values.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_thread.h"
-#include "chrome/browser/dom_ui/chrome_url_data_manager.h"
 #include "chrome/browser/printing/cloud_print/cloud_print_url.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/browser/webui/chrome_url_data_manager.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/in_process_browser_test.h"
diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc
index 9ed51ec..52944ff 100644
--- a/chrome/browser/profiles/profile.cc
+++ b/chrome/browser/profiles/profile.cc
@@ -20,7 +20,6 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/chrome_blob_storage_context.h"
-#include "chrome/browser/dom_ui/chrome_url_data_manager.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/extensions/extension_message_service.h"
@@ -37,6 +36,7 @@
 #include "chrome/browser/sync/profile_sync_service.h"
 #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/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
index d8e1fd6..5c7e003e 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/chrome_url_data_manager.h"
 #include "chrome/browser/dom_ui/ntp_resource_cache.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/extensions/default_apps.h"
@@ -84,6 +83,7 @@
 #include "chrome/browser/visitedlink/visitedlink_master.h"
 #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/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_paths_internal.h"
diff --git a/chrome/browser/remoting/remoting_resources_source.h b/chrome/browser/remoting/remoting_resources_source.h
index 4d73d8e..5d1f6fc 100644
--- a/chrome/browser/remoting/remoting_resources_source.h
+++ b/chrome/browser/remoting/remoting_resources_source.h
@@ -1,9 +1,12 @@
-// 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_REMOTING_REMOTING_RESOURCES_SOURCE_H_
+#define CHROME_BROWSER_REMOTING_REMOTING_RESOURCES_SOURCE_H_
+
 #include "base/message_loop.h"
-#include "chrome/browser/dom_ui/chrome_url_data_manager.h"
+#include "chrome/browser/webui/chrome_url_data_manager.h"
 #include "chrome/common/url_constants.h"
 
 class RemotingResourcesSource : public ChromeURLDataManager::DataSource {
@@ -29,3 +32,5 @@ class RemotingResourcesSource : public ChromeURLDataManager::DataSource {
 
   DISALLOW_COPY_AND_ASSIGN(RemotingResourcesSource);
 };
+
+#endif  // CHROME_BROWSER_REMOTING_REMOTING_RESOURCES_SOURCE_H_
diff --git a/chrome/browser/remoting/setup_flow.h b/chrome/browser/remoting/setup_flow.h
index 970072a..d8c017b 100644
--- a/chrome/browser/remoting/setup_flow.h
+++ b/chrome/browser/remoting/setup_flow.h
@@ -7,7 +7,7 @@
 
 #include "base/callback.h"
 #include "base/scoped_ptr.h"
-#include "chrome/browser/dom_ui/html_dialog_ui.h"
+#include "chrome/browser/webui/html_dialog_ui.h"
 #include "chrome/browser/webui/web_ui.h"
 #include "chrome/common/remoting/chromoting_host_info.h"
 
diff --git a/chrome/browser/sync/profile_sync_service_mock.cc b/chrome/browser/sync/profile_sync_service_mock.cc
index 99e9ede..39b9291 100644
--- a/chrome/browser/sync/profile_sync_service_mock.cc
+++ b/chrome/browser/sync/profile_sync_service_mock.cc
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "chrome/browser/sync/profile_sync_service_mock.h"
-#include "chrome/browser/dom_ui/chrome_url_data_manager.h"
+#include "chrome/browser/webui/chrome_url_data_manager.h"
 #include "chrome/common/url_constants.h"
 
 ProfileSyncServiceMock::ProfileSyncServiceMock() {}
diff --git a/chrome/browser/sync/sync_setup_flow.h b/chrome/browser/sync/sync_setup_flow.h
index dc22804..b346e6e 100644
--- a/chrome/browser/sync/sync_setup_flow.h
+++ b/chrome/browser/sync/sync_setup_flow.h
@@ -11,10 +11,10 @@
 
 #include "base/gtest_prod_util.h"
 #include "base/time.h"
-#include "chrome/browser/dom_ui/html_dialog_ui.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/sync_setup_wizard.h"
 #include "chrome/browser/sync/syncable/model_type.h"
+#include "chrome/browser/webui/html_dialog_ui.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/native_widget_types.h"
diff --git a/chrome/browser/sync/sync_setup_wizard.cc b/chrome/browser/sync/sync_setup_wizard.cc
index deb56a2..0dd2658 100644
--- a/chrome/browser/sync/sync_setup_wizard.cc
+++ b/chrome/browser/sync/sync_setup_wizard.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.
 
@@ -7,12 +7,12 @@
 #include "base/message_loop.h"
 #include "base/singleton.h"
 #include "chrome/browser/browser_thread.h"
-#include "chrome/browser/dom_ui/chrome_url_data_manager.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/sync_setup_flow.h"
+#include "chrome/browser/webui/chrome_url_data_manager.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
diff --git a/chrome/browser/ui/cocoa/constrained_html_delegate_mac.mm b/chrome/browser/ui/cocoa/constrained_html_delegate_mac.mm
index 553f3e24..52efd8e 100644
--- a/chrome/browser/ui/cocoa/constrained_html_delegate_mac.mm
+++ b/chrome/browser/ui/cocoa/constrained_html_delegate_mac.mm
@@ -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/constrained_html_ui.h"
+#include "chrome/browser/webui/constrained_html_ui.h"
 
 #include "base/scoped_nsobject.h"
-#include "chrome/browser/dom_ui/html_dialog_ui.h"
-#include "chrome/browser/dom_ui/html_dialog_tab_contents_delegate.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/cocoa/constrained_window_mac.h"
+#include "chrome/browser/webui/html_dialog_ui.h"
+#include "chrome/browser/webui/html_dialog_tab_contents_delegate.h"
 #import <Cocoa/Cocoa.h>
 #include "ipc/ipc_message.h"
 
diff --git a/chrome/browser/ui/cocoa/html_dialog_window_controller.h b/chrome/browser/ui/cocoa/html_dialog_window_controller.h
index 3fa41a3..89c3bf4 100644
--- a/chrome/browser/ui/cocoa/html_dialog_window_controller.h
+++ b/chrome/browser/ui/cocoa/html_dialog_window_controller.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.
 
@@ -10,7 +10,7 @@
 
 #include "base/basictypes.h"
 #include "base/scoped_ptr.h"
-#include "chrome/browser/dom_ui/html_dialog_ui.h"
+#include "chrome/browser/webui/html_dialog_ui.h"
 
 class HtmlDialogWindowDelegateBridge;
 class Profile;
diff --git a/chrome/browser/ui/cocoa/html_dialog_window_controller.mm b/chrome/browser/ui/cocoa/html_dialog_window_controller.mm
index 11d700c..d9fd127 100644
--- a/chrome/browser/ui/cocoa/html_dialog_window_controller.mm
+++ b/chrome/browser/ui/cocoa/html_dialog_window_controller.mm
@@ -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,13 +7,13 @@
 #include "base/logging.h"
 #include "base/scoped_nsobject.h"
 #include "base/sys_string_conversions.h"
-#include "chrome/browser/dom_ui/html_dialog_ui.h"
-#include "chrome/browser/dom_ui/html_dialog_tab_contents_delegate.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #import "chrome/browser/ui/browser_dialogs.h"
 #import "chrome/browser/ui/cocoa/browser_command_executor.h"
 #import "chrome/browser/ui/cocoa/chrome_event_processing_window.h"
+#include "chrome/browser/webui/html_dialog_tab_contents_delegate.h"
+#include "chrome/browser/webui/html_dialog_ui.h"
 #include "chrome/common/native_web_keyboard_event.h"
 #include "ipc/ipc_message.h"
 #include "ui/base/keycodes/keyboard_codes.h"
diff --git a/chrome/browser/ui/cocoa/html_dialog_window_controller_unittest.mm b/chrome/browser/ui/cocoa/html_dialog_window_controller_unittest.mm
index 02a8fbc..5e6de43 100644
--- a/chrome/browser/ui/cocoa/html_dialog_window_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/html_dialog_window_controller_unittest.mm
@@ -11,9 +11,9 @@
 
 #import "base/mac/scoped_nsautorelease_pool.h"
 #include "base/sys_string_conversions.h"
-#include "chrome/browser/dom_ui/html_dialog_ui.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/cocoa/cocoa_test_helper.h"
+#include "chrome/browser/webui/html_dialog_ui.h"
 #include "chrome/browser/webui/web_ui.h"
 #include "chrome/test/browser_with_test_window_test.h"
 #include "chrome/test/testing_profile.h"
diff --git a/chrome/browser/ui/gtk/constrained_html_delegate_gtk.cc b/chrome/browser/ui/gtk/constrained_html_delegate_gtk.cc
index 18b718f..670d4cb 100644
--- a/chrome/browser/ui/gtk/constrained_html_delegate_gtk.cc
+++ b/chrome/browser/ui/gtk/constrained_html_delegate_gtk.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/constrained_html_ui.h"
+#include "chrome/browser/webui/constrained_html_ui.h"
 
-#include "chrome/browser/dom_ui/html_dialog_tab_contents_delegate.h"
-#include "chrome/browser/dom_ui/html_dialog_ui.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/gtk/constrained_window_gtk.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/ui/gtk/tab_contents_container_gtk.h"
+#include "chrome/browser/webui/html_dialog_tab_contents_delegate.h"
+#include "chrome/browser/webui/html_dialog_ui.h"
 #include "chrome/common/notification_source.h"
 #include "ipc/ipc_message.h"
 #include "ui/gfx/rect.h"
diff --git a/chrome/browser/ui/gtk/html_dialog_gtk.cc b/chrome/browser/ui/gtk/html_dialog_gtk.cc
index 519d987..72ed2a1 100644
--- a/chrome/browser/ui/gtk/html_dialog_gtk.cc
+++ b/chrome/browser/ui/gtk/html_dialog_gtk.cc
@@ -8,12 +8,12 @@
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_window.h"
-#include "chrome/browser/dom_ui/html_dialog_ui.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/ui/gtk/tab_contents_container_gtk.h"
+#include "chrome/browser/webui/html_dialog_ui.h"
 #include "chrome/common/native_web_keyboard_event.h"
 #include "ipc/ipc_message.h"
 
diff --git a/chrome/browser/ui/gtk/html_dialog_gtk.h b/chrome/browser/ui/gtk/html_dialog_gtk.h
index 3134b42..25f0fdb 100644
--- a/chrome/browser/ui/gtk/html_dialog_gtk.h
+++ b/chrome/browser/ui/gtk/html_dialog_gtk.h
@@ -10,8 +10,8 @@
 #include <vector>
 
 #include "base/scoped_ptr.h"
-#include "chrome/browser/dom_ui/html_dialog_ui.h"
-#include "chrome/browser/dom_ui/html_dialog_tab_contents_delegate.h"
+#include "chrome/browser/webui/html_dialog_tab_contents_delegate.h"
+#include "chrome/browser/webui/html_dialog_ui.h"
 #include "ui/base/gtk/gtk_signal.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/size.h"
diff --git a/chrome/browser/ui/views/constrained_html_delegate_gtk.cc b/chrome/browser/ui/views/constrained_html_delegate_gtk.cc
index 04aee79..7b48fc4 100644
--- a/chrome/browser/ui/views/constrained_html_delegate_gtk.cc
+++ b/chrome/browser/ui/views/constrained_html_delegate_gtk.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/constrained_html_ui.h"
+#include "chrome/browser/webui/constrained_html_ui.h"
 
-#include "chrome/browser/dom_ui/html_dialog_tab_contents_delegate.h"
-#include "chrome/browser/dom_ui/html_dialog_ui.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/gtk/constrained_window_gtk.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/ui/views/tab_contents/tab_contents_container.h"
+#include "chrome/browser/webui/html_dialog_tab_contents_delegate.h"
+#include "chrome/browser/webui/html_dialog_ui.h"
 #include "ipc/ipc_message.h"
 #include "ui/gfx/rect.h"
 #include "views/widget/widget_gtk.h"
diff --git a/chrome/browser/ui/views/constrained_html_delegate_win.cc b/chrome/browser/ui/views/constrained_html_delegate_win.cc
index 98fe7666..744c4e0 100644
--- a/chrome/browser/ui/views/constrained_html_delegate_win.cc
+++ b/chrome/browser/ui/views/constrained_html_delegate_win.cc
@@ -2,13 +2,13 @@
 // 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/constrained_html_ui.h"
+#include "chrome/browser/webui/constrained_html_ui.h"
 
-#include "chrome/browser/dom_ui/html_dialog_tab_contents_delegate.h"
-#include "chrome/browser/dom_ui/html_dialog_ui.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/views/tab_contents/tab_contents_container.h"
+#include "chrome/browser/webui/html_dialog_tab_contents_delegate.h"
+#include "chrome/browser/webui/html_dialog_ui.h"
 #include "ipc/ipc_message.h"
 #include "ui/gfx/rect.h"
 #include "views/view.h"
diff --git a/chrome/browser/ui/views/html_dialog_view.h b/chrome/browser/ui/views/html_dialog_view.h
index dc8bf7c..1a2d5cb 100644
--- a/chrome/browser/ui/views/html_dialog_view.h
+++ b/chrome/browser/ui/views/html_dialog_view.h
@@ -8,9 +8,9 @@
 
 #include <string>
 
-#include "chrome/browser/dom_ui/html_dialog_ui.h"
-#include "chrome/browser/dom_ui/html_dialog_tab_contents_delegate.h"
 #include "chrome/browser/ui/views/dom_view.h"
+#include "chrome/browser/webui/html_dialog_tab_contents_delegate.h"
+#include "chrome/browser/webui/html_dialog_ui.h"
 #include "ui/gfx/size.h"
 #include "views/window/window_delegate.h"
 
diff --git a/chrome/browser/ui/views/html_dialog_view_browsertest.cc b/chrome/browser/ui/views/html_dialog_view_browsertest.cc
index 776fd2f..d5f78d0 100644
--- a/chrome/browser/ui/views/html_dialog_view_browsertest.cc
+++ b/chrome/browser/ui/views/html_dialog_view_browsertest.cc
@@ -7,15 +7,15 @@
 #include "base/file_path.h"
 #include "base/message_loop.h"
 #include "base/singleton.h"
-#include "chrome/browser/dom_ui/html_dialog_ui.h"
-#include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/renderer_host/render_widget_host_view.h"
+#include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/views/html_dialog_view.h"
+#include "chrome/browser/webui/html_dialog_ui.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/in_process_browser_test.h"
 #include "chrome/test/ui_test_utils.h"
-#include "testing/gtest/include/gtest/gtest.h"
 #include "testing/gmock/include/gmock/gmock.h"
+#include "testing/gtest/include/gtest/gtest.h"
 #include "views/widget/widget.h"
 #include "views/window/window.h"
 
diff --git a/chrome/browser/ui/views/keyboard_overlay_delegate.cc b/chrome/browser/ui/views/keyboard_overlay_delegate.cc
index 88ec7b1..2b2fef3 100644
--- a/chrome/browser/ui/views/keyboard_overlay_delegate.cc
+++ b/chrome/browser/ui/views/keyboard_overlay_delegate.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.
 
@@ -8,9 +8,9 @@
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/chromeos/frame/bubble_window.h"
-#include "chrome/browser/dom_ui/html_dialog_ui.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/views/html_dialog_view.h"
+#include "chrome/browser/webui/html_dialog_ui.h"
 #include "chrome/common/url_constants.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
diff --git a/chrome/browser/ui/views/keyboard_overlay_delegate.h b/chrome/browser/ui/views/keyboard_overlay_delegate.h
index 962fae2..c85b17b 100644
--- a/chrome/browser/ui/views/keyboard_overlay_delegate.h
+++ b/chrome/browser/ui/views/keyboard_overlay_delegate.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_UI_VIEWS_KEYBOARD_OVERLAY_DELEGATE_H_
 #define CHROME_BROWSER_UI_VIEWS_KEYBOARD_OVERLAY_DELEGATE_H_
 
-#include "chrome/browser/dom_ui/html_dialog_ui.h"
+#include "chrome/browser/webui/html_dialog_ui.h"
 #include "ui/gfx/native_widget_types.h"
 
 class KeyboardOverlayDelegate : public HtmlDialogUIDelegate {
  public:
-  KeyboardOverlayDelegate(const std::wstring& title);
+  explicit KeyboardOverlayDelegate(const std::wstring& title);
 
   // Shows the keyboard overlay dialog box.
   static void ShowDialog(gfx::NativeWindow owning_window);
diff --git a/chrome/browser/ui/views/select_file_dialog.cc b/chrome/browser/ui/views/select_file_dialog.cc
index 4f832312..b4a08ef 100644
--- a/chrome/browser/ui/views/select_file_dialog.cc
+++ b/chrome/browser/ui/views/select_file_dialog.cc
@@ -14,12 +14,12 @@
 #include "base/values.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_thread.h"
-#include "chrome/browser/dom_ui/html_dialog_ui.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/browser/ui/views/html_dialog_view.h"
+#include "chrome/browser/webui/html_dialog_ui.h"
 #include "chrome/common/url_constants.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
diff --git a/chrome/browser/dom_ui/app_launcher_handler.cc b/chrome/browser/webui/app_launcher_handler.cc
index 2570650..4844d77 100644
--- a/chrome/browser/dom_ui/app_launcher_handler.cc
+++ b/chrome/browser/webui/app_launcher_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/app_launcher_handler.h"
+#include "chrome/browser/webui/app_launcher_handler.h"
 
 #include <string>
 #include <vector>
diff --git a/chrome/browser/dom_ui/app_launcher_handler.h b/chrome/browser/webui/app_launcher_handler.h
index f117786..d093b4a 100644
--- a/chrome/browser/dom_ui/app_launcher_handler.h
+++ b/chrome/browser/webui/app_launcher_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_APP_LAUNCHER_HANDLER_H_
-#define CHROME_BROWSER_DOM_UI_APP_LAUNCHER_HANDLER_H_
+#ifndef CHROME_BROWSER_WEBUI_APP_LAUNCHER_HANDLER_H_
+#define CHROME_BROWSER_WEBUI_APP_LAUNCHER_HANDLER_H_
 #pragma once
 
 #include "base/scoped_ptr.h"
@@ -130,4 +130,4 @@ class AppLauncherHandler
   DISALLOW_COPY_AND_ASSIGN(AppLauncherHandler);
 };
 
-#endif  // CHROME_BROWSER_DOM_UI_APP_LAUNCHER_HANDLER_H_
+#endif  // CHROME_BROWSER_WEBUI_APP_LAUNCHER_HANDLER_H_
diff --git a/chrome/browser/webui/bookmarks_ui.cc b/chrome/browser/webui/bookmarks_ui.cc
index cbfb89e..e5bc4a6 100644
--- a/chrome/browser/webui/bookmarks_ui.cc
+++ b/chrome/browser/webui/bookmarks_ui.cc
@@ -8,9 +8,9 @@
 #include "base/ref_counted_memory.h"
 #include "base/singleton.h"
 #include "chrome/browser/browser_thread.h"
-#include "chrome/browser/dom_ui/chrome_url_data_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/browser/webui/chrome_url_data_manager.h"
 #include "chrome/common/url_constants.h"
 #include "grit/theme_resources.h"
 #include "ui/base/resource/resource_bundle.h"
diff --git a/chrome/browser/webui/bookmarks_ui.h b/chrome/browser/webui/bookmarks_ui.h
index 3968166..502e92d 100644
--- a/chrome/browser/webui/bookmarks_ui.h
+++ b/chrome/browser/webui/bookmarks_ui.h
@@ -8,7 +8,7 @@
 
 #include <string>
 
-#include "chrome/browser/dom_ui/chrome_url_data_manager.h"
+#include "chrome/browser/webui/chrome_url_data_manager.h"
 #include "chrome/browser/webui/web_ui.h"
 
 class GURL;
diff --git a/chrome/browser/webui/bug_report_ui.h b/chrome/browser/webui/bug_report_ui.h
index 0f3b2a9..bf14544 100644
--- a/chrome/browser/webui/bug_report_ui.h
+++ b/chrome/browser/webui/bug_report_ui.h
@@ -5,8 +5,8 @@
 #ifndef CHROME_BROWSER_WEBUI_BUG_REPORT_UI_H_
 #define CHROME_BROWSER_WEBUI_BUG_REPORT_UI_H_
 
-#include "chrome/browser/dom_ui/html_dialog_ui.h"
 #include "chrome/browser/ui/views/window.h"
+#include "chrome/browser/webui/html_dialog_ui.h"
 
 namespace gfx {
 class Rect;
diff --git a/chrome/browser/dom_ui/chrome_url_data_manager.cc b/chrome/browser/webui/chrome_url_data_manager.cc
index 338843f..c560783 100644
--- a/chrome/browser/dom_ui/chrome_url_data_manager.cc
+++ b/chrome/browser/webui/chrome_url_data_manager.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/chrome_url_data_manager.h"
+#include "chrome/browser/webui/chrome_url_data_manager.h"
 
 #include <vector>
 
@@ -13,9 +13,9 @@
 #include "base/synchronization/lock.h"
 #include "base/values.h"
 #include "chrome/browser/browser_thread.h"
-#include "chrome/browser/dom_ui/chrome_url_data_manager_backend.h"
 #include "chrome/browser/net/chrome_url_request_context.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/webui/chrome_url_data_manager_backend.h"
 #include "grit/platform_locale_settings.h"
 #include "ui/base/l10n/l10n_util.h"
 
diff --git a/chrome/browser/dom_ui/chrome_url_data_manager.h b/chrome/browser/webui/chrome_url_data_manager.h
index 41bc280..be4cab0 100644
--- a/chrome/browser/dom_ui/chrome_url_data_manager.h
+++ b/chrome/browser/webui/chrome_url_data_manager.h
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_DOM_UI_CHROME_URL_DATA_MANAGER_H_
-#define CHROME_BROWSER_DOM_UI_CHROME_URL_DATA_MANAGER_H_
+#ifndef CHROME_BROWSER_WEBUI_CHROME_URL_DATA_MANAGER_H_
+#define CHROME_BROWSER_WEBUI_CHROME_URL_DATA_MANAGER_H_
 #pragma once
 
 #include <map>
 #include <set>
 #include <string>
 
-#include "base/task.h"
 #include "base/ref_counted.h"
+#include "base/task.h"
 #include "chrome/browser/browser_thread.h"
 
 class ChromeURLDataManagerBackend;
@@ -180,4 +180,4 @@ class ChromeURLDataManager {
   DISALLOW_COPY_AND_ASSIGN(ChromeURLDataManager);
 };
 
-#endif  // CHROME_BROWSER_DOM_UI_CHROME_URL_DATA_MANAGER_H_
+#endif  // CHROME_BROWSER_WEBUI_CHROME_URL_DATA_MANAGER_H_
diff --git a/chrome/browser/dom_ui/chrome_url_data_manager_backend.cc b/chrome/browser/webui/chrome_url_data_manager_backend.cc
index 0048828..e484a05 100644
--- a/chrome/browser/dom_ui/chrome_url_data_manager_backend.cc
+++ b/chrome/browser/webui/chrome_url_data_manager_backend.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/chrome_url_data_manager_backend.h"
+#include "chrome/browser/webui/chrome_url_data_manager_backend.h"
 
 #include "base/file_util.h"
 #include "base/message_loop.h"
diff --git a/chrome/browser/dom_ui/chrome_url_data_manager_backend.h b/chrome/browser/webui/chrome_url_data_manager_backend.h
index fe900bc..01ffdb7 100644
--- a/chrome/browser/dom_ui/chrome_url_data_manager_backend.h
+++ b/chrome/browser/webui/chrome_url_data_manager_backend.h
@@ -2,13 +2,13 @@
 // 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_CHROME_URL_DATA_MANAGER_BACKEND_H_
-#define CHROME_BROWSER_DOM_UI_CHROME_URL_DATA_MANAGER_BACKEND_H_
+#ifndef CHROME_BROWSER_WEBUI_CHROME_URL_DATA_MANAGER_BACKEND_H_
+#define CHROME_BROWSER_WEBUI_CHROME_URL_DATA_MANAGER_BACKEND_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/ref_counted.h"
-#include "chrome/browser/dom_ui/chrome_url_data_manager.h"
+#include "chrome/browser/webui/chrome_url_data_manager.h"
 
 #include <map>
 #include <string>
@@ -96,4 +96,4 @@ class ChromeURLDataManagerBackend {
   DISALLOW_COPY_AND_ASSIGN(ChromeURLDataManagerBackend);
 };
 
-#endif  // CHROME_BROWSER_DOM_UI_CHROME_URL_DATA_MANAGER_BACKEND_H_
+#endif  // CHROME_BROWSER_WEBUI_CHROME_URL_DATA_MANAGER_BACKEND_H_
diff --git a/chrome/browser/webui/conflicts_ui.cc b/chrome/browser/webui/conflicts_ui.cc
index 1e041bb..73afb4d 100644
--- a/chrome/browser/webui/conflicts_ui.cc
+++ b/chrome/browser/webui/conflicts_ui.cc
@@ -11,11 +11,11 @@
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
-#include "chrome/browser/dom_ui/chrome_url_data_manager.h"
 #include "chrome/browser/enumerate_modules_model_win.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/chrome_url_data_manager.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
diff --git a/chrome/browser/dom_ui/constrained_html_ui.cc b/chrome/browser/webui/constrained_html_ui.cc
index 494199f..b7d3542 100644
--- a/chrome/browser/dom_ui/constrained_html_ui.cc
+++ b/chrome/browser/webui/constrained_html_ui.cc
@@ -2,12 +2,12 @@
 // 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/constrained_html_ui.h"
+#include "chrome/browser/webui/constrained_html_ui.h"
 
 #include "base/lazy_instance.h"
-#include "chrome/browser/dom_ui/html_dialog_ui.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/browser/webui/html_dialog_ui.h"
 #include "chrome/browser/webui/web_ui_util.h"
 #include "chrome/common/bindings_policy.h"
 
diff --git a/chrome/browser/dom_ui/constrained_html_ui.h b/chrome/browser/webui/constrained_html_ui.h
index 2b12560..6c20280 100644
--- a/chrome/browser/dom_ui/constrained_html_ui.h
+++ b/chrome/browser/webui/constrained_html_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_CONSTRAINED_HTML_UI_H_
-#define CHROME_BROWSER_DOM_UI_CONSTRAINED_HTML_UI_H_
+#ifndef CHROME_BROWSER_WEBUI_CONSTRAINED_HTML_UI_H_
+#define CHROME_BROWSER_WEBUI_CONSTRAINED_HTML_UI_H_
 #pragma once
 
 #include <vector>
@@ -61,4 +61,4 @@ class ConstrainedHtmlUI : public WebUI {
   DISALLOW_COPY_AND_ASSIGN(ConstrainedHtmlUI);
 };
 
-#endif  // CHROME_BROWSER_DOM_UI_CONSTRAINED_HTML_UI_H_
+#endif  // CHROME_BROWSER_WEBUI_CONSTRAINED_HTML_UI_H_
diff --git a/chrome/browser/dom_ui/downloads_dom_handler.cc b/chrome/browser/webui/downloads_dom_handler.cc
index 9f072b3..bc943e07 100644
--- a/chrome/browser/dom_ui/downloads_dom_handler.cc
+++ b/chrome/browser/webui/downloads_dom_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/downloads_dom_handler.h"
+#include "chrome/browser/webui/downloads_dom_handler.h"
 
 #include <algorithm>
 #include <functional>
@@ -16,14 +16,14 @@
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_thread.h"
-#include "chrome/browser/dom_ui/chrome_url_data_manager.h"
-#include "chrome/browser/dom_ui/fileicon_source.h"
 #include "chrome/browser/download/download_history.h"
 #include "chrome/browser/download/download_item.h"
 #include "chrome/browser/download/download_util.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/chrome_url_data_manager.h"
+#include "chrome/browser/webui/fileicon_source.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/url_constants.h"
 #include "grit/browser_resources.h"
diff --git a/chrome/browser/dom_ui/downloads_dom_handler.h b/chrome/browser/webui/downloads_dom_handler.h
index f6ffca4..c0a6d0f 100644
--- a/chrome/browser/dom_ui/downloads_dom_handler.h
+++ b/chrome/browser/webui/downloads_dom_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_DOWNLOADS_DOM_HANDLER_H_
-#define CHROME_BROWSER_DOM_UI_DOWNLOADS_DOM_HANDLER_H_
+#ifndef CHROME_BROWSER_WEBUI_DOWNLOADS_DOM_HANDLER_H_
+#define CHROME_BROWSER_WEBUI_DOWNLOADS_DOM_HANDLER_H_
 #pragma once
 
 #include <vector>
@@ -100,4 +100,4 @@ class DownloadsDOMHandler : public WebUIMessageHandler,
   DISALLOW_COPY_AND_ASSIGN(DownloadsDOMHandler);
 };
 
-#endif  // CHROME_BROWSER_DOM_UI_DOWNLOADS_DOM_HANDLER_H_
+#endif  // CHROME_BROWSER_WEBUI_DOWNLOADS_DOM_HANDLER_H_
diff --git a/chrome/browser/webui/downloads_ui.cc b/chrome/browser/webui/downloads_ui.cc
index 43b91b2..b9dc34d 100644
--- a/chrome/browser/webui/downloads_ui.cc
+++ b/chrome/browser/webui/downloads_ui.cc
@@ -10,11 +10,11 @@
 #include "base/values.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/defaults.h"
-#include "chrome/browser/dom_ui/chrome_url_data_manager.h"
-#include "chrome/browser/dom_ui/downloads_dom_handler.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/browser/webui/chrome_url_data_manager.h"
+#include "chrome/browser/webui/downloads_dom_handler.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/url_constants.h"
 #include "grit/browser_resources.h"
diff --git a/chrome/browser/webui/filebrowse_ui.h b/chrome/browser/webui/filebrowse_ui.h
index 86657368..bfffa5a 100644
--- a/chrome/browser/webui/filebrowse_ui.h
+++ b/chrome/browser/webui/filebrowse_ui.h
@@ -8,9 +8,9 @@
 
 #include <string>
 
-#include "chrome/browser/dom_ui/chrome_url_data_manager.h"
-#include "chrome/browser/dom_ui/html_dialog_ui.h"
 #include "chrome/browser/history/history.h"
+#include "chrome/browser/webui/chrome_url_data_manager.h"
+#include "chrome/browser/webui/html_dialog_ui.h"
 #include "net/base/directory_lister.h"
 
 class Browser;
diff --git a/chrome/browser/dom_ui/fileicon_source.cc b/chrome/browser/webui/fileicon_source.cc
index 78f69fe..c403f36 100644
--- a/chrome/browser/dom_ui/fileicon_source.cc
+++ b/chrome/browser/webui/fileicon_source.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/fileicon_source.h"
+#include "chrome/browser/webui/fileicon_source.h"
 
 #include "base/callback.h"
 #include "base/file_path.h"
diff --git a/chrome/browser/dom_ui/fileicon_source.h b/chrome/browser/webui/fileicon_source.h
index 1bcf060..a515def 100644
--- a/chrome/browser/dom_ui/fileicon_source.h
+++ b/chrome/browser/webui/fileicon_source.h
@@ -1,15 +1,15 @@
-// Copyright (c) 2006-2008 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_FILEICON_SOURCE_H_
-#define CHROME_BROWSER_DOM_UI_FILEICON_SOURCE_H_
+#ifndef CHROME_BROWSER_WEBUI_FILEICON_SOURCE_H_
+#define CHROME_BROWSER_WEBUI_FILEICON_SOURCE_H_
 #pragma once
 
 #include <string>
 
-#include "chrome/browser/dom_ui/chrome_url_data_manager.h"
 #include "chrome/browser/icon_manager.h"
+#include "chrome/browser/webui/chrome_url_data_manager.h"
 
 class GURL;
 class RefCountedBytes;
@@ -44,4 +44,4 @@ class FileIconSource : public ChromeURLDataManager::DataSource {
 
   DISALLOW_COPY_AND_ASSIGN(FileIconSource);
 };
-#endif  // CHROME_BROWSER_DOM_UI_FILEICON_SOURCE_H_
+#endif  // CHROME_BROWSER_WEBUI_FILEICON_SOURCE_H_
diff --git a/chrome/browser/webui/flags_ui.cc b/chrome/browser/webui/flags_ui.cc
index c959a5a..ae83a92 100644
--- a/chrome/browser/webui/flags_ui.cc
+++ b/chrome/browser/webui/flags_ui.cc
@@ -12,10 +12,10 @@
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_thread.h"
-#include "chrome/browser/dom_ui/chrome_url_data_manager.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/browser/webui/chrome_url_data_manager.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
diff --git a/chrome/browser/dom_ui/foreign_session_handler.cc b/chrome/browser/webui/foreign_session_handler.cc
index 77b953a..c8fac01 100644
--- a/chrome/browser/dom_ui/foreign_session_handler.cc
+++ b/chrome/browser/webui/foreign_session_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/foreign_session_handler.h"
+#include "chrome/browser/webui/foreign_session_handler.h"
 
 #include <algorithm>
 #include <string>
diff --git a/chrome/browser/dom_ui/foreign_session_handler.h b/chrome/browser/webui/foreign_session_handler.h
index fa048ee..672272b 100644
--- a/chrome/browser/dom_ui/foreign_session_handler.h
+++ b/chrome/browser/webui/foreign_session_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_FOREIGN_SESSION_HANDLER_H_
-#define CHROME_BROWSER_DOM_UI_FOREIGN_SESSION_HANDLER_H_
+#ifndef CHROME_BROWSER_WEBUI_FOREIGN_SESSION_HANDLER_H_
+#define CHROME_BROWSER_WEBUI_FOREIGN_SESSION_HANDLER_H_
 #pragma once
 
 #include <vector>
@@ -60,4 +60,4 @@ class ForeignSessionHandler : public WebUIMessageHandler,
 
 }  // namespace browser_sync
 
-#endif  // CHROME_BROWSER_DOM_UI_FOREIGN_SESSION_HANDLER_H_
+#endif  // CHROME_BROWSER_WEBUI_FOREIGN_SESSION_HANDLER_H_
diff --git a/chrome/browser/dom_ui/generic_handler.cc b/chrome/browser/webui/generic_handler.cc
index d293cfb..e3a4a63 100644
--- a/chrome/browser/dom_ui/generic_handler.cc
+++ b/chrome/browser/webui/generic_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/generic_handler.h"
+#include "chrome/browser/webui/generic_handler.h"
 
 #include "base/logging.h"
 #include "base/values.h"
diff --git a/chrome/browser/dom_ui/generic_handler.h b/chrome/browser/webui/generic_handler.h
index b757e84..1f010ce 100644
--- a/chrome/browser/dom_ui/generic_handler.h
+++ b/chrome/browser/webui/generic_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_GENERIC_HANDLER_H_
-#define CHROME_BROWSER_DOM_UI_GENERIC_HANDLER_H_
+#ifndef CHROME_BROWSER_WEBUI_GENERIC_HANDLER_H_
+#define CHROME_BROWSER_WEBUI_GENERIC_HANDLER_H_
 #pragma once
 
 #include "chrome/browser/webui/web_ui.h"
@@ -25,4 +25,4 @@ class GenericHandler : public WebUIMessageHandler {
   DISALLOW_COPY_AND_ASSIGN(GenericHandler);
 };
 
-#endif  // CHROME_BROWSER_DOM_UI_GENERIC_HANDLER_H_
+#endif  // CHROME_BROWSER_WEBUI_GENERIC_HANDLER_H_
diff --git a/chrome/browser/webui/gpu_internals_ui.cc b/chrome/browser/webui/gpu_internals_ui.cc
index 2bcfb9e..567fb10 100644
--- a/chrome/browser/webui/gpu_internals_ui.cc
+++ b/chrome/browser/webui/gpu_internals_ui.cc
@@ -20,7 +20,6 @@
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_thread.h"
-#include "chrome/browser/dom_ui/chrome_url_data_manager.h"
 #include "chrome/browser/gpu_process_host.h"
 #include "chrome/browser/gpu_process_host_ui_shim.h"
 #include "chrome/browser/io_thread.h"
@@ -31,6 +30,7 @@
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/browser/webui/chrome_url_data_manager.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/jstemplate_builder.h"
diff --git a/chrome/browser/webui/history2_ui.h b/chrome/browser/webui/history2_ui.h
index cca93f0..d7fb4f1 100644
--- a/chrome/browser/webui/history2_ui.h
+++ b/chrome/browser/webui/history2_ui.h
@@ -10,8 +10,8 @@
 
 #include "base/string16.h"
 #include "chrome/browser/cancelable_request.h"
-#include "chrome/browser/dom_ui/chrome_url_data_manager.h"
 #include "chrome/browser/history/history.h"
+#include "chrome/browser/webui/chrome_url_data_manager.h"
 #include "chrome/browser/webui/web_ui.h"
 #include "chrome/common/notification_registrar.h"
 
diff --git a/chrome/browser/webui/history_ui.h b/chrome/browser/webui/history_ui.h
index 5cfbe9f..553cb0b 100644
--- a/chrome/browser/webui/history_ui.h
+++ b/chrome/browser/webui/history_ui.h
@@ -10,8 +10,8 @@
 
 #include "base/string16.h"
 #include "chrome/browser/cancelable_request.h"
-#include "chrome/browser/dom_ui/chrome_url_data_manager.h"
 #include "chrome/browser/history/history.h"
+#include "chrome/browser/webui/chrome_url_data_manager.h"
 #include "chrome/browser/webui/web_ui.h"
 #include "chrome/common/notification_registrar.h"
 
diff --git a/chrome/browser/dom_ui/html_dialog_tab_contents_delegate.cc b/chrome/browser/webui/html_dialog_tab_contents_delegate.cc
index 4a41b83..729c90b 100644
--- a/chrome/browser/dom_ui/html_dialog_tab_contents_delegate.cc
+++ b/chrome/browser/webui/html_dialog_tab_contents_delegate.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/html_dialog_tab_contents_delegate.h"
+#include "chrome/browser/webui/html_dialog_tab_contents_delegate.h"
 
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
diff --git a/chrome/browser/dom_ui/html_dialog_tab_contents_delegate.h b/chrome/browser/webui/html_dialog_tab_contents_delegate.h
index 4642fdd..5ed8795 100644
--- a/chrome/browser/dom_ui/html_dialog_tab_contents_delegate.h
+++ b/chrome/browser/webui/html_dialog_tab_contents_delegate.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_HTML_DIALOG_TAB_CONTENTS_DELEGATE_H_
-#define CHROME_BROWSER_DOM_UI_HTML_DIALOG_TAB_CONTENTS_DELEGATE_H_
+#ifndef CHROME_BROWSER_WEBUI_HTML_DIALOG_TAB_CONTENTS_DELEGATE_H_
+#define CHROME_BROWSER_WEBUI_HTML_DIALOG_TAB_CONTENTS_DELEGATE_H_
 #pragma once
 
 #include "chrome/browser/tab_contents/tab_contents_delegate.h"
@@ -61,4 +61,4 @@ class HtmlDialogTabContentsDelegate : public TabContentsDelegate {
   Profile* profile_;  // Weak pointer.  Always an original profile.
 };
 
-#endif  // CHROME_BROWSER_DOM_UI_HTML_DIALOG_TAB_CONTENTS_DELEGATE_H_
+#endif  // CHROME_BROWSER_WEBUI_HTML_DIALOG_TAB_CONTENTS_DELEGATE_H_
diff --git a/chrome/browser/dom_ui/html_dialog_ui.cc b/chrome/browser/webui/html_dialog_ui.cc
index 427ea5e..a755c8e 100644
--- a/chrome/browser/dom_ui/html_dialog_ui.cc
+++ b/chrome/browser/webui/html_dialog_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/html_dialog_ui.h"
+#include "chrome/browser/webui/html_dialog_ui.h"
 
 #include "base/callback.h"
 #include "base/lazy_instance.h"
diff --git a/chrome/browser/dom_ui/html_dialog_ui.h b/chrome/browser/webui/html_dialog_ui.h
index 65c7e6c..4ccc3ee0 100644
--- a/chrome/browser/dom_ui/html_dialog_ui.h
+++ b/chrome/browser/webui/html_dialog_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_HTML_DIALOG_UI_H_
-#define CHROME_BROWSER_DOM_UI_HTML_DIALOG_UI_H_
+#ifndef CHROME_BROWSER_WEBUI_HTML_DIALOG_UI_H_
+#define CHROME_BROWSER_WEBUI_HTML_DIALOG_UI_H_
 #pragma once
 
 #include <string>
@@ -117,4 +117,4 @@ class ExternalHtmlDialogUI : public HtmlDialogUI {
   virtual ~ExternalHtmlDialogUI();
 };
 
-#endif  // CHROME_BROWSER_DOM_UI_HTML_DIALOG_UI_H_
+#endif  // CHROME_BROWSER_WEBUI_HTML_DIALOG_UI_H_
diff --git a/chrome/browser/webui/keyboard_ui.cc b/chrome/browser/webui/keyboard_ui.cc
index 2fb7f6d..899b62b 100644
--- a/chrome/browser/webui/keyboard_ui.cc
+++ b/chrome/browser/webui/keyboard_ui.cc
@@ -8,9 +8,9 @@
 #include "base/singleton.h"
 #include "base/string_piece.h"
 #include "chrome/browser/browser_thread.h"
-#include "chrome/browser/dom_ui/chrome_url_data_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/browser/webui/chrome_url_data_manager.h"
 #include "chrome/common/url_constants.h"
 #include "grit/browser_resources.h"
 #include "ui/base/resource/resource_bundle.h"
diff --git a/chrome/browser/webui/keyboard_ui.h b/chrome/browser/webui/keyboard_ui.h
index 7373a8f..dd112d6 100644
--- a/chrome/browser/webui/keyboard_ui.h
+++ b/chrome/browser/webui/keyboard_ui.h
@@ -8,7 +8,7 @@
 
 #include <string>
 
-#include "chrome/browser/dom_ui/chrome_url_data_manager.h"
+#include "chrome/browser/webui/chrome_url_data_manager.h"
 #include "chrome/browser/webui/web_ui.h"
 
 class Profile;
diff --git a/chrome/browser/webui/mediaplayer_ui.h b/chrome/browser/webui/mediaplayer_ui.h
index d23b2f5..85af3e7 100644
--- a/chrome/browser/webui/mediaplayer_ui.h
+++ b/chrome/browser/webui/mediaplayer_ui.h
@@ -9,7 +9,7 @@
 #include <set>
 #include <vector>
 
-#include "chrome/browser/dom_ui/chrome_url_data_manager.h"
+#include "chrome/browser/webui/chrome_url_data_manager.h"
 #include "chrome/browser/webui/web_ui.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
diff --git a/chrome/browser/webui/net_internals_ui.cc b/chrome/browser/webui/net_internals_ui.cc
index 265ebe9..0aaddd1 100644
--- a/chrome/browser/webui/net_internals_ui.cc
+++ b/chrome/browser/webui/net_internals_ui.cc
@@ -21,7 +21,6 @@
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_thread.h"
-#include "chrome/browser/dom_ui/chrome_url_data_manager.h"
 #include "chrome/browser/io_thread.h"
 #include "chrome/browser/net/chrome_net_log.h"
 #include "chrome/browser/net/connection_tester.h"
@@ -32,6 +31,7 @@
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_view.h"
 #include "chrome/browser/ui/shell_dialogs.h"
+#include "chrome/browser/webui/chrome_url_data_manager.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/jstemplate_builder.h"
diff --git a/chrome/browser/webui/plugins_ui.cc b/chrome/browser/webui/plugins_ui.cc
index 8498c65..a799170 100644
--- a/chrome/browser/webui/plugins_ui.cc
+++ b/chrome/browser/webui/plugins_ui.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/chrome_url_data_manager.h"
 #include "chrome/browser/plugin_updater.h"
 #include "chrome/browser/prefs/pref_member.h"
 #include "chrome/browser/prefs/pref_service.h"
@@ -22,6 +21,7 @@
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
+#include "chrome/browser/webui/chrome_url_data_manager.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/notification_service.h"
diff --git a/chrome/browser/webui/remoting_ui.cc b/chrome/browser/webui/remoting_ui.cc
index bfb1191..f9e3e1f 100644
--- a/chrome/browser/webui/remoting_ui.cc
+++ b/chrome/browser/webui/remoting_ui.cc
@@ -6,9 +6,9 @@
 
 #include "base/singleton.h"
 #include "chrome/browser/browser_thread.h"
-#include "chrome/browser/dom_ui/chrome_url_data_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/browser/webui/chrome_url_data_manager.h"
 #include "chrome/common/url_constants.h"
 #include "grit/theme_resources.h"
 #include "ui/base/resource/resource_bundle.h"
diff --git a/chrome/browser/webui/web_ui.cc b/chrome/browser/webui/web_ui.cc
index 531f972..5c57653 100644
--- a/chrome/browser/webui/web_ui.cc
+++ b/chrome/browser/webui/web_ui.cc
@@ -10,12 +10,12 @@
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
-#include "chrome/browser/dom_ui/generic_handler.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_view.h"
 #include "chrome/browser/themes/browser_theme_provider.h"
+#include "chrome/browser/webui/generic_handler.h"
 #include "chrome/common/bindings_policy.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/render_messages_params.h"
diff --git a/chrome/browser/webui/web_ui_factory.cc b/chrome/browser/webui/web_ui_factory.cc
index d3fcd01..a28f7b6 100644
--- a/chrome/browser/webui/web_ui_factory.cc
+++ b/chrome/browser/webui/web_ui_factory.cc
@@ -6,8 +6,6 @@
 
 #include "base/command_line.h"
 #include "chrome/browser/about_flags.h"
-#include "chrome/browser/dom_ui/constrained_html_ui.h"
-#include "chrome/browser/dom_ui/html_dialog_ui.h"
 #include "chrome/browser/dom_ui/new_tab_ui.h"
 #include "chrome/browser/dom_ui/options/options_ui.h"
 #include "chrome/browser/dom_ui/print_preview_ui.h"
@@ -21,6 +19,7 @@
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/webui/bookmarks_ui.h"
 #include "chrome/browser/webui/bug_report_ui.h"
+#include "chrome/browser/webui/constrained_html_ui.h"
 #include "chrome/browser/webui/crashes_ui.h"
 #include "chrome/browser/webui/devtools_ui.h"
 #include "chrome/browser/webui/downloads_ui.h"
@@ -28,6 +27,7 @@
 #include "chrome/browser/webui/gpu_internals_ui.h"
 #include "chrome/browser/webui/history2_ui.h"
 #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/plugins_ui.h"
 #include "chrome/browser/webui/remoting_ui.h"
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 3208a44..565c687 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -858,26 +858,6 @@
         'browser/disposition_utils.cc',
         'browser/disposition_utils.h',
         'browser/dom_operation_notification_details.h',
-        'browser/dom_ui/app_launcher_handler.cc',
-        'browser/dom_ui/app_launcher_handler.h',
-        'browser/dom_ui/chrome_url_data_manager_backend.cc',
-        'browser/dom_ui/chrome_url_data_manager_backend.h',
-        'browser/dom_ui/chrome_url_data_manager.cc',
-        'browser/dom_ui/chrome_url_data_manager.h',
-        'browser/dom_ui/constrained_html_ui.cc',
-        'browser/dom_ui/constrained_html_ui.h',
-        'browser/dom_ui/downloads_dom_handler.cc',
-        'browser/dom_ui/downloads_dom_handler.h',
-        'browser/dom_ui/fileicon_source.cc',
-        'browser/dom_ui/fileicon_source.h',
-        'browser/dom_ui/foreign_session_handler.cc',
-        'browser/dom_ui/foreign_session_handler.h',
-        'browser/dom_ui/generic_handler.cc',
-        'browser/dom_ui/generic_handler.h',
-        'browser/dom_ui/html_dialog_tab_contents_delegate.cc',
-        'browser/dom_ui/html_dialog_tab_contents_delegate.h',
-        'browser/dom_ui/html_dialog_ui.cc',
-        'browser/dom_ui/html_dialog_ui.h',
         'browser/dom_ui/most_visited_handler.cc',
         'browser/dom_ui/most_visited_handler.h',
         'browser/dom_ui/new_tab_page_sync_handler.cc',
@@ -3536,26 +3516,46 @@
         'browser/webdata/web_database.cc',
         'browser/webdata/web_database.h',
         'browser/webdata/web_database_win.cc',
+        'browser/webui/app_launcher_handler.cc',
+        'browser/webui/app_launcher_handler.h',
         'browser/webui/bookmarks_ui.cc',
         'browser/webui/bookmarks_ui.h',
         'browser/webui/bug_report_ui.cc',
         'browser/webui/bug_report_ui.h',
+        'browser/webui/chrome_url_data_manager_backend.cc',
+        'browser/webui/chrome_url_data_manager_backend.h',
+        'browser/webui/chrome_url_data_manager.cc',
+        'browser/webui/chrome_url_data_manager.h',
+        'browser/webui/constrained_html_ui.cc',
+        'browser/webui/constrained_html_ui.h',
         'browser/webui/crashes_ui.cc',
         'browser/webui/crashes_ui.h',
         'browser/webui/devtools_ui.cc',
         'browser/webui/devtools_ui.h',
+        'browser/webui/downloads_dom_handler.cc',
+        'browser/webui/downloads_dom_handler.h',
         'browser/webui/downloads_ui.cc',
         'browser/webui/downloads_ui.h',
         'browser/webui/filebrowse_ui.cc',
         'browser/webui/filebrowse_ui.h',
+        'browser/webui/fileicon_source.cc',
+        'browser/webui/fileicon_source.h',
         'browser/webui/flags_ui.cc',
         'browser/webui/flags_ui.h',
+        'browser/webui/foreign_session_handler.cc',
+        'browser/webui/foreign_session_handler.h',
+        'browser/webui/generic_handler.cc',
+        'browser/webui/generic_handler.h',
         'browser/webui/gpu_internals_ui.cc',
         'browser/webui/gpu_internals_ui.h',
         'browser/webui/history2_ui.cc',
         'browser/webui/history2_ui.h',
         'browser/webui/history_ui.cc',
         'browser/webui/history_ui.h',
+        'browser/webui/html_dialog_tab_contents_delegate.cc',
+        'browser/webui/html_dialog_tab_contents_delegate.h',
+        'browser/webui/html_dialog_ui.cc',
+        'browser/webui/html_dialog_ui.h',
         'browser/webui/keyboard_ui.cc',
         'browser/webui/keyboard_ui.h',
         'browser/webui/mediaplayer_ui.cc',
diff --git a/chrome/test/testing_profile.cc b/chrome/test/testing_profile.cc
index 3839847..9d72599 100644
--- a/chrome/test/testing_profile.cc
+++ b/chrome/test/testing_profile.cc
@@ -16,10 +16,9 @@
 #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/chrome_url_data_manager.h"
 #include "chrome/browser/dom_ui/ntp_resource_cache.h"
-#include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_pref_value_map.h"
+#include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/favicon_service.h"
 #include "chrome/browser/geolocation/geolocation_content_settings_map.h"
 #include "chrome/browser/geolocation/geolocation_permission_context.h"
@@ -38,6 +37,7 @@
 #include "chrome/browser/sync/profile_sync_service_mock.h"
 #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/common/chrome_constants.h"
 #include "chrome/common/net/url_request_context_getter.h"
 #include "chrome/common/notification_service.h"
author	tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>	2011-02-18 22:21:43 +0000
committer	tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>	2011-02-18 22:21:43 +0000
commit	33d6752e62f1e94c16560e2991ff307033686af0 (patch)
tree	f442c02176fb9057eac8c52d5b5367f28dbb7996
parent	71893bf4539fe2d65cfc3fc2e0f532a31db9f76a (diff)
download	chromium_src-33d6752e62f1e94c16560e2991ff307033686af0.zip chromium_src-33d6752e62f1e94c16560e2991ff307033686af0.tar.gz chromium_src-33d6752e62f1e94c16560e2991ff307033686af0.tar.bz2