21 files changed, 62 insertions, 62 deletions
diff --git a/chrome/browser/chromeos/usb_mount_observer.cc b/chrome/browser/chromeos/usb_mount_observer.cc
index 6f056e8..7e0a68b 100644
--- a/chrome/browser/chromeos/usb_mount_observer.cc
+++ b/chrome/browser/chromeos/usb_mount_observer.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,12 +6,12 @@
 
 #include "base/command_line.h"
 #include "base/singleton.h"
-#include "chrome/browser/dom_ui/filebrowse_ui.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
+#include "chrome/browser/webui/filebrowse_ui.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
 
diff --git a/chrome/browser/chromeos/usb_mount_observer_browsertest.cc b/chrome/browser/chromeos/usb_mount_observer_browsertest.cc
index c70fbeb..7e44b1c 100644
--- a/chrome/browser/chromeos/usb_mount_observer_browsertest.cc
+++ b/chrome/browser/chromeos/usb_mount_observer_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.
 
@@ -7,9 +7,9 @@
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/chromeos/cros/mock_mount_library.h"
 #include "chrome/browser/chromeos/usb_mount_observer.h"
-#include "chrome/browser/dom_ui/mediaplayer_ui.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/webui/mediaplayer_ui.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/automation/dom_element_proxy.h"
 #include "chrome/test/in_process_browser_test.h"
diff --git a/chrome/browser/dom_ui/mediaplayer_browsertest.cc b/chrome/browser/dom_ui/mediaplayer_browsertest.cc
index 74cbc30..17958e2 100644
--- a/chrome/browser/dom_ui/mediaplayer_browsertest.cc
+++ b/chrome/browser/dom_ui/mediaplayer_browsertest.cc
@@ -1,17 +1,17 @@
-// 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 "base/command_line.h"
 #include "base/ref_counted.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/test/automation/dom_element_proxy.h"
-#include "chrome/browser/dom_ui/mediaplayer_ui.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
+#include "chrome/browser/webui/mediaplayer_ui.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
+#include "chrome/test/automation/dom_element_proxy.h"
 #include "chrome/test/in_process_browser_test.h"
 #include "chrome/test/ui_test_utils.h"
 
diff --git a/chrome/browser/platform_util_chromeos.cc b/chrome/browser/platform_util_chromeos.cc
index cbca7c8..13fda8e 100644
--- a/chrome/browser/platform_util_chromeos.cc
+++ b/chrome/browser/platform_util_chromeos.cc
@@ -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.
 
@@ -12,9 +12,9 @@
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_thread.h"
-#include "chrome/browser/dom_ui/filebrowse_ui.h"
-#include "chrome/browser/dom_ui/mediaplayer_ui.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
+#include "chrome/browser/webui/filebrowse_ui.h"
+#include "chrome/browser/webui/mediaplayer_ui.h"
 #include "chrome/common/process_watcher.h"
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index c29c2d1..63e6fa0 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -14,7 +14,6 @@
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/debugger/devtools_manager.h"
 #include "chrome/browser/dom_ui/new_tab_ui.h"
-#include "chrome/browser/dom_ui/plugins_ui.h"
 #include "chrome/browser/download/download_prefs.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_web_ui.h"
@@ -53,6 +52,7 @@
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/upgrade_detector.h"
 #include "chrome/browser/webui/flags_ui.h"
+#include "chrome/browser/webui/plugins_ui.h"
 #include "chrome/common/pref_names.h"
 
 #if defined(TOOLKIT_VIEWS)  // TODO(port): whittle this down as we port
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index e75750a..e3df05d 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -34,7 +34,6 @@
 #include "chrome/browser/debugger/devtools_manager.h"
 #include "chrome/browser/debugger/devtools_toggle_action.h"
 #include "chrome/browser/debugger/devtools_window.h"
-#include "chrome/browser/dom_ui/filebrowse_ui.h"
 #include "chrome/browser/dom_ui/options/content_settings_handler.h"
 #include "chrome/browser/download/download_item.h"
 #include "chrome/browser/download/download_item_model.h"
@@ -91,6 +90,7 @@
 #include "chrome/browser/upgrade_detector.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "chrome/browser/webui/bug_report_ui.h"
+#include "chrome/browser/webui/filebrowse_ui.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/content_restriction.h"
diff --git a/chrome/browser/ui/browser_init.cc b/chrome/browser/ui/browser_init.cc
index f7ed81a..30cc3af 100644
--- a/chrome/browser/ui/browser_init.cc
+++ b/chrome/browser/ui/browser_init.cc
@@ -93,7 +93,7 @@
 #include "chrome/browser/chromeos/usb_mount_observer.h"
 #include "chrome/browser/chromeos/wm_message_listener.h"
 #include "chrome/browser/chromeos/wm_overview_controller.h"
-#include "chrome/browser/dom_ui/mediaplayer_ui.h"
+#include "chrome/browser/webui/mediaplayer_ui.h"
 #endif
 
 #if defined(HAVE_XINPUT2)
diff --git a/chrome/browser/dom_ui/filebrowse_ui.cc b/chrome/browser/webui/filebrowse_ui.cc
index f9a6fee..f2dcd46 100644
--- a/chrome/browser/dom_ui/filebrowse_ui.cc
+++ b/chrome/browser/webui/filebrowse_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/filebrowse_ui.h"
+#include "chrome/browser/webui/filebrowse_ui.h"
 
 #include <algorithm>
 #include <vector>
@@ -23,7 +23,6 @@
 #include "base/weak_ptr.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/browser_thread.h"
-#include "chrome/browser/dom_ui/mediaplayer_ui.h"
 #include "chrome/browser/dom_ui/web_ui_favicon_source.h"
 #include "chrome/browser/download/download_item.h"
 #include "chrome/browser/download/download_manager.h"
@@ -37,6 +36,7 @@
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/browser_window.h"
+#include "chrome/browser/webui/mediaplayer_ui.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/jstemplate_builder.h"
diff --git a/chrome/browser/dom_ui/filebrowse_ui.h b/chrome/browser/webui/filebrowse_ui.h
index 5d2e867..86657368 100644
--- a/chrome/browser/dom_ui/filebrowse_ui.h
+++ b/chrome/browser/webui/filebrowse_ui.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_DOM_UI_FILEBROWSE_UI_H_
-#define CHROME_BROWSER_DOM_UI_FILEBROWSE_UI_H_
+#ifndef CHROME_BROWSER_WEBUI_FILEBROWSE_UI_H_
+#define CHROME_BROWSER_WEBUI_FILEBROWSE_UI_H_
 #pragma once
 
 #include <string>
@@ -36,4 +36,4 @@ class FileBrowseUI : public HtmlDialogUI {
   DISALLOW_COPY_AND_ASSIGN(FileBrowseUI);
 };
 
-#endif  // CHROME_BROWSER_DOM_UI_FILEBROWSE_UI_H_
+#endif  // CHROME_BROWSER_WEBUI_FILEBROWSE_UI_H_
diff --git a/chrome/browser/dom_ui/mediaplayer_ui.cc b/chrome/browser/webui/mediaplayer_ui.cc
index 23fc229..34ca09f 100644
--- a/chrome/browser/dom_ui/mediaplayer_ui.cc
+++ b/chrome/browser/webui/mediaplayer_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/mediaplayer_ui.h"
+#include "chrome/browser/webui/mediaplayer_ui.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
diff --git a/chrome/browser/dom_ui/mediaplayer_ui.h b/chrome/browser/webui/mediaplayer_ui.h
index 0c6fcc3..d23b2f5 100644
--- a/chrome/browser/dom_ui/mediaplayer_ui.h
+++ b/chrome/browser/webui/mediaplayer_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_MEDIAPLAYER_UI_H_
-#define CHROME_BROWSER_DOM_UI_MEDIAPLAYER_UI_H_
+#ifndef CHROME_BROWSER_WEBUI_MEDIAPLAYER_UI_H_
+#define CHROME_BROWSER_WEBUI_MEDIAPLAYER_UI_H_
 #pragma once
 
 #include <set>
@@ -158,4 +158,4 @@ class MediaplayerUI : public WebUI {
   DISALLOW_COPY_AND_ASSIGN(MediaplayerUI);
 };
 
-#endif  // CHROME_BROWSER_DOM_UI_MEDIAPLAYER_UI_H_
+#endif  // CHROME_BROWSER_WEBUI_MEDIAPLAYER_UI_H_
diff --git a/chrome/browser/dom_ui/net_internals_ui.cc b/chrome/browser/webui/net_internals_ui.cc
index 6808367..265ebe9 100644
--- a/chrome/browser/dom_ui/net_internals_ui.cc
+++ b/chrome/browser/webui/net_internals_ui.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/dom_ui/net_internals_ui.h"
+#include "chrome/browser/webui/net_internals_ui.h"
 
 #include <algorithm>
 #include <string>
@@ -47,9 +47,9 @@
 #include "net/disk_cache/disk_cache.h"
 #include "net/http/http_alternate_protocols.h"
 #include "net/http/http_cache.h"
-#include "net/http/http_stream_factory.h"
 #include "net/http/http_network_layer.h"
 #include "net/http/http_network_session.h"
+#include "net/http/http_stream_factory.h"
 #include "net/proxy/proxy_service.h"
 #include "net/url_request/url_request_context.h"
 #include "ui/base/l10n/l10n_util.h"
diff --git a/chrome/browser/dom_ui/net_internals_ui.h b/chrome/browser/webui/net_internals_ui.h
index 53af9ae..c00612a 100644
--- a/chrome/browser/dom_ui/net_internals_ui.h
+++ b/chrome/browser/webui/net_internals_ui.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_DOM_UI_NET_INTERNALS_UI_H_
-#define CHROME_BROWSER_DOM_UI_NET_INTERNALS_UI_H_
+#ifndef CHROME_BROWSER_WEBUI_NET_INTERNALS_UI_H_
+#define CHROME_BROWSER_WEBUI_NET_INTERNALS_UI_H_
 #pragma once
 
 #include "chrome/browser/webui/web_ui.h"
@@ -16,4 +16,4 @@ class NetInternalsUI : public WebUI {
   DISALLOW_COPY_AND_ASSIGN(NetInternalsUI);
 };
 
-#endif  // CHROME_BROWSER_DOM_UI_NET_INTERNALS_UI_H_
+#endif  // CHROME_BROWSER_WEBUI_NET_INTERNALS_UI_H_
diff --git a/chrome/browser/dom_ui/plugins_ui.cc b/chrome/browser/webui/plugins_ui.cc
index e895ff9..8498c65 100644
--- a/chrome/browser/dom_ui/plugins_ui.cc
+++ b/chrome/browser/webui/plugins_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/plugins_ui.h"
+#include "chrome/browser/webui/plugins_ui.h"
 
 #include <algorithm>
 #include <string>
diff --git a/chrome/browser/dom_ui/plugins_ui.h b/chrome/browser/webui/plugins_ui.h
index 787ef53..2577df7 100644
--- a/chrome/browser/dom_ui/plugins_ui.h
+++ b/chrome/browser/webui/plugins_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_PLUGINS_UI_H_
-#define CHROME_BROWSER_DOM_UI_PLUGINS_UI_H_
+#ifndef CHROME_BROWSER_WEBUI_PLUGINS_UI_H_
+#define CHROME_BROWSER_WEBUI_PLUGINS_UI_H_
 #pragma once
 
 #include "chrome/browser/webui/web_ui.h"
@@ -22,4 +22,4 @@ class PluginsUI : public WebUI {
   DISALLOW_COPY_AND_ASSIGN(PluginsUI);
 };
 
-#endif  // CHROME_BROWSER_DOM_UI_PLUGINS_UI_H_
+#endif  // CHROME_BROWSER_WEBUI_PLUGINS_UI_H_
diff --git a/chrome/browser/dom_ui/remoting_ui.cc b/chrome/browser/webui/remoting_ui.cc
index e849bb0..bfb1191 100644
--- a/chrome/browser/dom_ui/remoting_ui.cc
+++ b/chrome/browser/webui/remoting_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/remoting_ui.h"
+#include "chrome/browser/webui/remoting_ui.h"
 
 #include "base/singleton.h"
 #include "chrome/browser/browser_thread.h"
diff --git a/chrome/browser/dom_ui/remoting_ui.h b/chrome/browser/webui/remoting_ui.h
index 4da8f30..3e93bb7 100644
--- a/chrome/browser/dom_ui/remoting_ui.h
+++ b/chrome/browser/webui/remoting_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_REMOTING_UI_H_
-#define CHROME_BROWSER_DOM_UI_REMOTING_UI_H_
+#ifndef CHROME_BROWSER_WEBUI_REMOTING_UI_H_
+#define CHROME_BROWSER_WEBUI_REMOTING_UI_H_
 #pragma once
 
 #include "chrome/browser/webui/web_ui.h"
@@ -22,4 +22,4 @@ class RemotingUI : public WebUI {
   DISALLOW_COPY_AND_ASSIGN(RemotingUI);
 };
 
-#endif  // CHROME_BROWSER_DOM_UI_REMOTING_UI_H_
+#endif  // CHROME_BROWSER_WEBUI_REMOTING_UI_H_
diff --git a/chrome/browser/dom_ui/slideshow_ui.cc b/chrome/browser/webui/slideshow_ui.cc
index 5552e6a..eafe307 100644
--- a/chrome/browser/dom_ui/slideshow_ui.cc
+++ b/chrome/browser/webui/slideshow_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/slideshow_ui.h"
+#include "chrome/browser/webui/slideshow_ui.h"
 
 #include "base/callback.h"
 #include "base/message_loop.h"
@@ -28,8 +28,8 @@
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
-#include "net/base/escape.h"
 #include "net/base/directory_lister.h"
+#include "net/base/escape.h"
 #include "ui/base/resource/resource_bundle.h"
 
 static const char kPropertyPath[] = "path";
diff --git a/chrome/browser/dom_ui/slideshow_ui.h b/chrome/browser/webui/slideshow_ui.h
index 88740ac..62a688e 100644
--- a/chrome/browser/dom_ui/slideshow_ui.h
+++ b/chrome/browser/webui/slideshow_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_SLIDESHOW_UI_H_
-#define CHROME_BROWSER_DOM_UI_SLIDESHOW_UI_H_
+#ifndef CHROME_BROWSER_WEBUI_SLIDESHOW_UI_H_
+#define CHROME_BROWSER_WEBUI_SLIDESHOW_UI_H_
 #pragma once
 
 #include "chrome/browser/webui/web_ui.h"
@@ -16,4 +16,4 @@ class SlideshowUI : public WebUI {
   DISALLOW_COPY_AND_ASSIGN(SlideshowUI);
 };
 
-#endif  // CHROME_BROWSER_DOM_UI_SLIDESHOW_UI_H_
+#endif  // CHROME_BROWSER_WEBUI_SLIDESHOW_UI_H_
diff --git a/chrome/browser/webui/web_ui_factory.cc b/chrome/browser/webui/web_ui_factory.cc
index 0d050b7..81c71c2 100644
--- a/chrome/browser/webui/web_ui_factory.cc
+++ b/chrome/browser/webui/web_ui_factory.cc
@@ -8,13 +8,9 @@
 #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/net_internals_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/plugins_ui.h"
 #include "chrome/browser/dom_ui/print_preview_ui.h"
-#include "chrome/browser/dom_ui/remoting_ui.h"
-#include "chrome/browser/dom_ui/slideshow_ui.h"
 #include "chrome/browser/dom_ui/sync_internals_ui.h"
 #include "chrome/browser/dom_ui/textfields_ui.h"
 #include "chrome/browser/extensions/extension_service.h"
@@ -31,6 +27,10 @@
 #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/net_internals_ui.h"
+#include "chrome/browser/webui/plugins_ui.h"
+#include "chrome/browser/webui/remoting_ui.h"
+#include "chrome/browser/webui/slideshow_ui.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/url_constants.h"
@@ -45,8 +45,8 @@
 #include "chrome/browser/chromeos/webui/register_page_ui.h"
 #include "chrome/browser/chromeos/webui/system_info_ui.h"
 #include "chrome/browser/chromeos/webui/wrench_menu_ui.h"
-#include "chrome/browser/dom_ui/filebrowse_ui.h"
-#include "chrome/browser/dom_ui/mediaplayer_ui.h"
+#include "chrome/browser/webui/filebrowse_ui.h"
+#include "chrome/browser/webui/mediaplayer_ui.h"
 #endif
 
 #if defined(TOUCH_UI)
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 4d232df..6745c31 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -866,8 +866,6 @@
         'browser/dom_ui/constrained_html_ui.h',
         'browser/dom_ui/downloads_dom_handler.cc',
         'browser/dom_ui/downloads_dom_handler.h',
-        'browser/dom_ui/filebrowse_ui.cc',
-        'browser/dom_ui/filebrowse_ui.h',
         'browser/dom_ui/fileicon_source.cc',
         'browser/dom_ui/fileicon_source.h',
         'browser/dom_ui/foreign_session_handler.cc',
@@ -878,12 +876,8 @@
         '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/mediaplayer_ui.cc',
-        'browser/dom_ui/mediaplayer_ui.h',
         'browser/dom_ui/most_visited_handler.cc',
         'browser/dom_ui/most_visited_handler.h',
-        'browser/dom_ui/net_internals_ui.cc',
-        'browser/dom_ui/net_internals_ui.h',
         'browser/dom_ui/new_tab_page_sync_handler.cc',
         'browser/dom_ui/new_tab_page_sync_handler.h',
         'browser/dom_ui/new_tab_ui.cc',
@@ -942,22 +936,16 @@
         'browser/dom_ui/options/search_engine_manager_handler.h',
         'browser/dom_ui/options/stop_syncing_handler.cc',
         'browser/dom_ui/options/stop_syncing_handler.h',
-        'browser/dom_ui/plugins_ui.cc',
-        'browser/dom_ui/plugins_ui.h',
         'browser/dom_ui/print_preview_handler.cc',
         'browser/dom_ui/print_preview_handler.h',
         'browser/dom_ui/print_preview_ui.cc',
         'browser/dom_ui/print_preview_ui.h',
         'browser/dom_ui/print_preview_ui_html_source.cc',
         'browser/dom_ui/print_preview_ui_html_source.h',
-        'browser/dom_ui/remoting_ui.cc',
-        'browser/dom_ui/remoting_ui.h',
         'browser/dom_ui/shared_resources_data_source.cc',
         'browser/dom_ui/shared_resources_data_source.h',
         'browser/dom_ui/shown_sections_handler.cc',
         'browser/dom_ui/shown_sections_handler.h',
-        'browser/dom_ui/slideshow_ui.cc',
-        'browser/dom_ui/slideshow_ui.h',
         'browser/dom_ui/sync_internals_html_source.cc',
         'browser/dom_ui/sync_internals_html_source.h',
         'browser/dom_ui/sync_internals_ui.cc',
@@ -3550,6 +3538,8 @@
         'browser/webui/devtools_ui.h',
         'browser/webui/downloads_ui.cc',
         'browser/webui/downloads_ui.h',
+        'browser/webui/filebrowse_ui.cc',
+        'browser/webui/filebrowse_ui.h',
         'browser/webui/flags_ui.cc',
         'browser/webui/flags_ui.h',
         'browser/webui/gpu_internals_ui.cc',
@@ -3560,6 +3550,16 @@
         'browser/webui/history_ui.h',
         'browser/webui/keyboard_ui.cc',
         'browser/webui/keyboard_ui.h',
+        'browser/webui/mediaplayer_ui.cc',
+        'browser/webui/mediaplayer_ui.h',
+        'browser/webui/net_internals_ui.cc',
+        'browser/webui/net_internals_ui.h',
+        'browser/webui/plugins_ui.cc',
+        'browser/webui/plugins_ui.h',
+        'browser/webui/remoting_ui.cc',
+        'browser/webui/remoting_ui.h',
+        'browser/webui/slideshow_ui.cc',
+        'browser/webui/slideshow_ui.h',
         'browser/webui/web_ui.cc',
         'browser/webui/web_ui.h',
         'browser/webui/web_ui_factory.cc',
@@ -3594,14 +3594,14 @@
           'sources/': [
             ['exclude', '^browser/chromeos'],
             ['exclude', 'browser/dom_ui/chrome_about_ui.cc'],
-            ['exclude', 'browser/dom_ui/filebrowse_ui.cc'],
-            ['exclude', 'browser/dom_ui/mediaplayer_ui.cc'],
-            ['exclude', 'browser/dom_ui/slideshow_ui.cc'],
             ['exclude', 'browser/extensions/extension_tts_api_chromeos.cc'],
             ['exclude', 'browser/oom_priority_manager.cc'],
             ['exclude', 'browser/oom_priority_manager.h'],
             ['exclude', 'browser/renderer_host/offline_resource_handler.cc'],
             ['exclude', 'browser/renderer_host/offline_resource_handler.h'],
+            ['exclude', 'browser/webui/filebrowse_ui.cc'],
+            ['exclude', 'browser/webui/mediaplayer_ui.cc'],
+            ['exclude', 'browser/webui/slideshow_ui.cc'],
           ],
         }],
         ['chromeos==1', {