[dom ui settings] move settings bits in dom_ui/ to dom_ui/options/

BUG=none
TEST=compile + trybots

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

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

59 files changed, 132 insertions, 203 deletions

diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
index db21f8a..a504887 100644
--- a/chrome/browser/browser.cc
+++ b/chrome/browser/browser.cc
@@ -36,8 +36,8 @@
 #include "chrome/browser/debugger/devtools_toggle_action.h"
 #include "chrome/browser/debugger/devtools_window.h"
 #include "chrome/browser/dock_info.h"
-#include "chrome/browser/dom_ui/content_settings_handler.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"
 #include "chrome/browser/download/download_manager.h"
diff --git a/chrome/browser/chromeos/dom_ui/core_chromeos_options_handler.h b/chrome/browser/chromeos/dom_ui/core_chromeos_options_handler.h
index d3b63f5..25ef417 100644
--- a/chrome/browser/chromeos/dom_ui/core_chromeos_options_handler.h
+++ b/chrome/browser/chromeos/dom_ui/core_chromeos_options_handler.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_CHROMEOS_DOM_UI_CORE_CHROMEOS_OPTIONS_HANDLER_H_
 #pragma once
 
-#include "chrome/browser/dom_ui/core_options_handler.h"
+#include "chrome/browser/dom_ui/options/core_options_handler.h"
 
 namespace chromeos {
 
diff --git a/chrome/browser/chromeos/dom_ui/cros_options_page_ui_handler.h b/chrome/browser/chromeos/dom_ui/cros_options_page_ui_handler.h
index eb7d450..78c07ee 100644
--- a/chrome/browser/chromeos/dom_ui/cros_options_page_ui_handler.h
+++ b/chrome/browser/chromeos/dom_ui/cros_options_page_ui_handler.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include "chrome/browser/chromeos/cros_settings_provider.h"
-#include "chrome/browser/dom_ui/options_ui.h"
+#include "chrome/browser/dom_ui/options/options_ui.h"
 
 namespace chromeos {
 
diff --git a/chrome/browser/chromeos/dom_ui/internet_options_handler.h b/chrome/browser/chromeos/dom_ui/internet_options_handler.h
index a3685a9..5d4aa80 100644
--- a/chrome/browser/chromeos/dom_ui/internet_options_handler.h
+++ b/chrome/browser/chromeos/dom_ui/internet_options_handler.h
@@ -8,7 +8,7 @@
 #include <string>
 
 #include "chrome/browser/chromeos/cros/network_library.h"
-#include "chrome/browser/dom_ui/options_ui.h"
+#include "chrome/browser/dom_ui/options/options_ui.h"
 
 class SkBitmap;
 namespace views {
diff --git a/chrome/browser/chromeos/dom_ui/labs_handler.h b/chrome/browser/chromeos/dom_ui/labs_handler.h
index 3fc1121..015a347 100644
--- a/chrome/browser/chromeos/dom_ui/labs_handler.h
+++ b/chrome/browser/chromeos/dom_ui/labs_handler.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_CHROMEOS_DOM_UI_LABS_HANDLER_H_
 #pragma once
 
-#include "chrome/browser/dom_ui/options_ui.h"
+#include "chrome/browser/dom_ui/options/options_ui.h"
 
 // ChromeOS labs options page UI handler.
 class LabsHandler : public OptionsPageUIHandler {
diff --git a/chrome/browser/chromeos/dom_ui/language_chewing_options_handler.h b/chrome/browser/chromeos/dom_ui/language_chewing_options_handler.h
index 224fecc..01ca4d4 100644
--- a/chrome/browser/chromeos/dom_ui/language_chewing_options_handler.h
+++ b/chrome/browser/chromeos/dom_ui/language_chewing_options_handler.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_CHROMEOS_DOM_UI_LANGUAGE_CHEWING_OPTIONS_HANDLER_H_
 #pragma once
 
-#include "chrome/browser/dom_ui/options_ui.h"
+#include "chrome/browser/dom_ui/options/options_ui.h"
 
 class DictionaryValue;
 
diff --git a/chrome/browser/chromeos/dom_ui/language_customize_modifier_keys_handler.h b/chrome/browser/chromeos/dom_ui/language_customize_modifier_keys_handler.h
index 91bc70f..179e3f1 100644
--- a/chrome/browser/chromeos/dom_ui/language_customize_modifier_keys_handler.h
+++ b/chrome/browser/chromeos/dom_ui/language_customize_modifier_keys_handler.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_CHROMEOS_DOM_UI_LANGUAGE_CUSTOMIZE_MODIFIER_KEYS_HANDLER_H_  // NOLINT
 #pragma once
 
-#include "chrome/browser/dom_ui/options_ui.h"
+#include "chrome/browser/dom_ui/options/options_ui.h"
 #include "chrome/browser/prefs/pref_member.h"
 
 namespace chromeos {
diff --git a/chrome/browser/chromeos/dom_ui/language_hangul_options_handler.h b/chrome/browser/chromeos/dom_ui/language_hangul_options_handler.h
index cedfb05..3861456 100644
--- a/chrome/browser/chromeos/dom_ui/language_hangul_options_handler.h
+++ b/chrome/browser/chromeos/dom_ui/language_hangul_options_handler.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_CHROMEOS_DOM_UI_LANGUAGE_HANGUL_OPTIONS_HANDLER_H_
 #pragma once
 
-#include "chrome/browser/dom_ui/options_ui.h"
+#include "chrome/browser/dom_ui/options/options_ui.h"
 
 class DictionaryValue;
 class ListValue;
diff --git a/chrome/browser/chromeos/dom_ui/language_mozc_options_handler.h b/chrome/browser/chromeos/dom_ui/language_mozc_options_handler.h
index 16b02e8..995ffde 100644
--- a/chrome/browser/chromeos/dom_ui/language_mozc_options_handler.h
+++ b/chrome/browser/chromeos/dom_ui/language_mozc_options_handler.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_CHROMEOS_DOM_UI_LANGUAGE_MOZC_OPTIONS_HANDLER_H_
 #pragma once
 
-#include "chrome/browser/dom_ui/options_ui.h"
+#include "chrome/browser/dom_ui/options/options_ui.h"
 
 class DictionaryValue;
 
diff --git a/chrome/browser/chromeos/dom_ui/language_options_handler.h b/chrome/browser/chromeos/dom_ui/language_options_handler.h
index 79ab6857..54cd9ab 100644
--- a/chrome/browser/chromeos/dom_ui/language_options_handler.h
+++ b/chrome/browser/chromeos/dom_ui/language_options_handler.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
-#include "chrome/browser/dom_ui/options_ui.h"
+#include "chrome/browser/dom_ui/options/options_ui.h"
 
 class DictionaryValue;
 class ListValue;
diff --git a/chrome/browser/chromeos/dom_ui/language_pinyin_options_handler.h b/chrome/browser/chromeos/dom_ui/language_pinyin_options_handler.h
index 51558d0..89a300d 100644
--- a/chrome/browser/chromeos/dom_ui/language_pinyin_options_handler.h
+++ b/chrome/browser/chromeos/dom_ui/language_pinyin_options_handler.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_CHROMEOS_DOM_UI_LANGUAGE_PINYIN_OPTIONS_HANDLER_H_
 #pragma once
 
-#include "chrome/browser/dom_ui/options_ui.h"
+#include "chrome/browser/dom_ui/options/options_ui.h"
 
 class DictionaryValue;
 
diff --git a/chrome/browser/dom_ui/dom_ui_factory.cc b/chrome/browser/dom_ui/dom_ui_factory.cc
index ac3c4624..865ea5f 100644
--- a/chrome/browser/dom_ui/dom_ui_factory.cc
+++ b/chrome/browser/dom_ui/dom_ui_factory.cc
@@ -19,9 +19,9 @@
 #include "chrome/browser/dom_ui/labs_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_ui.h"
 #include "chrome/browser/dom_ui/remoting_ui.h"
 #include "chrome/browser/dom_ui/plugins_ui.h"
+#include "chrome/browser/dom_ui/options/options_ui.h"
 #include "chrome/browser/dom_ui/slideshow_ui.h"
 #include "chrome/browser/extensions/extension_dom_ui.h"
 #include "chrome/browser/extensions/extensions_service.h"
diff --git a/chrome/browser/dom_ui/about_page_handler.cc b/chrome/browser/dom_ui/options/about_page_handler.cc
index 750a921..8d34a11 100644
--- a/chrome/browser/dom_ui/about_page_handler.cc
+++ b/chrome/browser/dom_ui/options/about_page_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/about_page_handler.h"
+#include "chrome/browser/dom_ui/options/about_page_handler.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
diff --git a/chrome/browser/dom_ui/about_page_handler.h b/chrome/browser/dom_ui/options/about_page_handler.h
index aa0c5bc..2e4a760 100644
--- a/chrome/browser/dom_ui/about_page_handler.h
+++ b/chrome/browser/dom_ui/options/about_page_handler.h
@@ -2,12 +2,12 @@
 // 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_ABOUT_PAGE_HANDLER_H_
-#define CHROME_BROWSER_DOM_UI_ABOUT_PAGE_HANDLER_H_
+#ifndef CHROME_BROWSER_DOM_UI_OPTIONS_ABOUT_PAGE_HANDLER_H_
+#define CHROME_BROWSER_DOM_UI_OPTIONS_ABOUT_PAGE_HANDLER_H_
 
 #include <string>
 
-#include "chrome/browser/dom_ui/options_ui.h"
+#include "chrome/browser/dom_ui/options/options_ui.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/cros/update_library.h"
@@ -53,5 +53,4 @@ class AboutPageHandler : public OptionsPageUIHandler {
   DISALLOW_COPY_AND_ASSIGN(AboutPageHandler);
 };
 
-#endif  // CHROME_BROWSER_DOM_UI_ABOUT_PAGE_HANDLER_H_
-
+#endif  // CHROME_BROWSER_DOM_UI_OPTIONS_ABOUT_PAGE_HANDLER_H_
diff --git a/chrome/browser/dom_ui/add_startup_page_handler.cc b/chrome/browser/dom_ui/options/add_startup_page_handler.cc
index 072f805..36d3cf7d 100644
--- a/chrome/browser/dom_ui/add_startup_page_handler.cc
+++ b/chrome/browser/dom_ui/options/add_startup_page_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/add_startup_page_handler.h"
+#include "chrome/browser/dom_ui/options/add_startup_page_handler.h"
 
 #include "app/l10n_util.h"
 #include "base/string_number_conversions.h"
diff --git a/chrome/browser/dom_ui/add_startup_page_handler.h b/chrome/browser/dom_ui/options/add_startup_page_handler.h
index 1df865d..9ca2e2a 100644
--- a/chrome/browser/dom_ui/add_startup_page_handler.h
+++ b/chrome/browser/dom_ui/options/add_startup_page_handler.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_ADD_STARTUP_PAGE_HANDLER_H_
-#define CHROME_BROWSER_DOM_UI_ADD_STARTUP_PAGE_HANDLER_H_
+#ifndef CHROME_BROWSER_DOM_UI_OPTIONS_ADD_STARTUP_PAGE_HANDLER_H_
+#define CHROME_BROWSER_DOM_UI_OPTIONS_ADD_STARTUP_PAGE_HANDLER_H_
 #pragma once
 
 #include "app/table_model_observer.h"
 #include "base/basictypes.h"
-#include "chrome/browser/dom_ui/options_ui.h"
+#include "chrome/browser/dom_ui/options/options_ui.h"
 
 class PossibleURLModel;
 
@@ -40,4 +40,4 @@ class AddStartupPageHandler : public OptionsPageUIHandler,
   DISALLOW_COPY_AND_ASSIGN(AddStartupPageHandler);
 };
 
-#endif  // CHROME_BROWSER_DOM_UI_ADD_STARTUP_PAGE_HANDLER_H_
+#endif  // CHROME_BROWSER_DOM_UI_OPTIONS_ADD_STARTUP_PAGE_HANDLER_H_
diff --git a/chrome/browser/dom_ui/advanced_options_handler.cc b/chrome/browser/dom_ui/options/advanced_options_handler.cc
index cb727f5..5cc184f 100644
--- a/chrome/browser/dom_ui/advanced_options_handler.cc
+++ b/chrome/browser/dom_ui/options/advanced_options_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/advanced_options_handler.h"
+#include "chrome/browser/dom_ui/options/advanced_options_handler.h"
 
 #include "app/l10n_util.h"
 #include "base/basictypes.h"
@@ -11,7 +11,7 @@
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/dom_ui/options_managed_banner_handler.h"
+#include "chrome/browser/dom_ui/options/options_managed_banner_handler.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/download/download_prefs.h"
 #include "chrome/browser/metrics/user_metrics.h"
@@ -30,7 +30,7 @@
 #include "grit/locale_settings.h"
 
 #if !defined(OS_CHROMEOS)
-#include "chrome/browser/dom_ui/advanced_options_utils.h"
+#include "chrome/browser/dom_ui/options/advanced_options_utils.h"
 #endif
 
 #if defined(OS_WIN)
diff --git a/chrome/browser/dom_ui/advanced_options_handler.h b/chrome/browser/dom_ui/options/advanced_options_handler.h
index f85ec2a..df3569b 100644
--- a/chrome/browser/dom_ui/advanced_options_handler.h
+++ b/chrome/browser/dom_ui/options/advanced_options_handler.h
@@ -2,11 +2,11 @@
 // 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_ADVANCED_OPTIONS_HANDLER_H_
-#define CHROME_BROWSER_DOM_UI_ADVANCED_OPTIONS_HANDLER_H_
+#ifndef CHROME_BROWSER_DOM_UI_OPTIONS_ADVANCED_OPTIONS_HANDLER_H_
+#define CHROME_BROWSER_DOM_UI_OPTIONS_ADVANCED_OPTIONS_HANDLER_H_
 #pragma once
 
-#include "chrome/browser/dom_ui/options_ui.h"
+#include "chrome/browser/dom_ui/options/options_ui.h"
 #include "chrome/browser/prefs/pref_member.h"
 #include "chrome/browser/prefs/pref_set_observer.h"
 #include "chrome/browser/shell_dialogs.h"
diff --git a/chrome/browser/dom_ui/advanced_options_utils.h b/chrome/browser/dom_ui/options/advanced_options_utils.h
index 669fcf7..a60f89f 100644
--- a/chrome/browser/dom_ui/advanced_options_utils.h
+++ b/chrome/browser/dom_ui/options/advanced_options_utils.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_ADVANCED_OPTIONS_UTILS_H_
-#define CHROME_BROWSER_DOM_UI_ADVANCED_OPTIONS_UTILS_H_
+#ifndef CHROME_BROWSER_DOM_UI_OPTIONS_ADVANCED_OPTIONS_UTILS_H_
+#define CHROME_BROWSER_DOM_UI_OPTIONS_ADVANCED_OPTIONS_UTILS_H_
 
 #include "base/basictypes.h"
 
@@ -22,4 +22,4 @@ class AdvancedOptionsUtilities {
   DISALLOW_IMPLICIT_CONSTRUCTORS(AdvancedOptionsUtilities);
 };
 
-#endif  // CHROME_BROWSER_DOM_UI_ADVANCED_OPTIONS_UTILS_H_
+#endif  // CHROME_BROWSER_DOM_UI_OPTIONS_ADVANCED_OPTIONS_UTILS_H_
diff --git a/chrome/browser/dom_ui/advanced_options_utils_gtk.cc b/chrome/browser/dom_ui/options/advanced_options_utils_gtk.cc
index b471616..22d1639 100644
--- a/chrome/browser/dom_ui/advanced_options_utils_gtk.cc
+++ b/chrome/browser/dom_ui/options/advanced_options_utils_gtk.cc
@@ -4,7 +4,7 @@
 
 #if !defined(OS_CHROMEOS)
 
-#include "chrome/browser/dom_ui/advanced_options_utils.h"
+#include "chrome/browser/dom_ui/options/advanced_options_utils.h"
 
 #include "app/gtk_signal.h"
 #include "app/gtk_util.h"
diff --git a/chrome/browser/dom_ui/advanced_options_utils_mac.mm b/chrome/browser/dom_ui/options/advanced_options_utils_mac.mm
index 0557df4..1e1fcab 100644
--- a/chrome/browser/dom_ui/advanced_options_utils_mac.mm
+++ b/chrome/browser/dom_ui/options/advanced_options_utils_mac.mm
@@ -4,7 +4,7 @@
 
 #import <Cocoa/Cocoa.h>
 
-#include "chrome/browser/dom_ui/advanced_options_utils.h"
+#include "chrome/browser/dom_ui/options/advanced_options_utils.h"
 
 #include "base/logging.h"
 #include "base/scoped_aedesc.h"
diff --git a/chrome/browser/dom_ui/advanced_options_utils_win.cc b/chrome/browser/dom_ui/options/advanced_options_utils_win.cc
index cbff7d3..0bb0a8a 100644
--- a/chrome/browser/dom_ui/advanced_options_utils_win.cc
+++ b/chrome/browser/dom_ui/options/advanced_options_utils_win.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/advanced_options_utils.h"
+#include "chrome/browser/dom_ui/options/advanced_options_utils.h"
 
 #include <windows.h>
 #include <cryptuiapi.h>
diff --git a/chrome/browser/dom_ui/autofill_options_handler.cc b/chrome/browser/dom_ui/options/autofill_options_handler.cc
index 173e8b7..68177ef 100644
--- a/chrome/browser/dom_ui/autofill_options_handler.cc
+++ b/chrome/browser/dom_ui/options/autofill_options_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/autofill_options_handler.h"
+#include "chrome/browser/dom_ui/options/autofill_options_handler.h"
 
 #include <vector>
 
diff --git a/chrome/browser/dom_ui/autofill_options_handler.h b/chrome/browser/dom_ui/options/autofill_options_handler.h
index dabae6a..e932047 100644
--- a/chrome/browser/dom_ui/autofill_options_handler.h
+++ b/chrome/browser/dom_ui/options/autofill_options_handler.h
@@ -2,11 +2,11 @@
 // 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_AUTOFILL_OPTIONS_HANDLER_H_
-#define CHROME_BROWSER_DOM_UI_AUTOFILL_OPTIONS_HANDLER_H_
+#ifndef CHROME_BROWSER_DOM_UI_OPTIONS_AUTOFILL_OPTIONS_HANDLER_H_
+#define CHROME_BROWSER_DOM_UI_OPTIONS_AUTOFILL_OPTIONS_HANDLER_H_
 
 #include "chrome/browser/autofill/personal_data_manager.h"
-#include "chrome/browser/dom_ui/options_ui.h"
+#include "chrome/browser/dom_ui/options/options_ui.h"
 
 class AutoFillOptionsHandler : public OptionsPageUIHandler,
                                public PersonalDataManager::Observer {
@@ -71,4 +71,4 @@ class AutoFillOptionsHandler : public OptionsPageUIHandler,
   DISALLOW_COPY_AND_ASSIGN(AutoFillOptionsHandler);
 };
 
-#endif  // CHROME_BROWSER_DOM_UI_AUTOFILL_OPTIONS_HANDLER_H_
+#endif  // CHROME_BROWSER_DOM_UI_OPTIONS_AUTOFILL_OPTIONS_HANDLER_H_
diff --git a/chrome/browser/dom_ui/browser_options_handler.cc b/chrome/browser/dom_ui/options/browser_options_handler.cc
index 3a21171..1a4e3e4 100644
--- a/chrome/browser/dom_ui/browser_options_handler.cc
+++ b/chrome/browser/dom_ui/options/browser_options_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/browser_options_handler.h"
+#include "chrome/browser/dom_ui/options/browser_options_handler.h"
 
 #include "app/l10n_util.h"
 #include "base/basictypes.h"
@@ -14,7 +14,7 @@
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/custom_home_pages_table_model.h"
 #include "chrome/browser/dom_ui/dom_ui_favicon_source.h"
-#include "chrome/browser/dom_ui/options_managed_banner_handler.h"
+#include "chrome/browser/dom_ui/options/options_managed_banner_handler.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/options_window.h"
diff --git a/chrome/browser/dom_ui/browser_options_handler.h b/chrome/browser/dom_ui/options/browser_options_handler.h
index 0bc1ebb..fd70ccf 100644
--- a/chrome/browser/dom_ui/browser_options_handler.h
+++ b/chrome/browser/dom_ui/options/browser_options_handler.h
@@ -2,12 +2,12 @@
 // 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_BROWSER_OPTIONS_HANDLER_H_
-#define CHROME_BROWSER_DOM_UI_BROWSER_OPTIONS_HANDLER_H_
+#ifndef CHROME_BROWSER_DOM_UI_OPTIONS_BROWSER_OPTIONS_HANDLER_H_
+#define CHROME_BROWSER_DOM_UI_OPTIONS_BROWSER_OPTIONS_HANDLER_H_
 #pragma once
 
 #include "app/table_model_observer.h"
-#include "chrome/browser/dom_ui/options_ui.h"
+#include "chrome/browser/dom_ui/options/options_ui.h"
 #include "chrome/browser/search_engines/template_url_model_observer.h"
 #include "chrome/browser/shell_integration.h"
 
@@ -92,4 +92,4 @@ class BrowserOptionsHandler : public OptionsPageUIHandler,
   DISALLOW_COPY_AND_ASSIGN(BrowserOptionsHandler);
 };
 
-#endif  // CHROME_BROWSER_DOM_UI_BROWSER_OPTIONS_HANDLER_H_
+#endif  // CHROME_BROWSER_DOM_UI_OPTIONS_BROWSER_OPTIONS_HANDLER_H_
diff --git a/chrome/browser/dom_ui/certificate_manager_handler.cc b/chrome/browser/dom_ui/options/certificate_manager_handler.cc
index 08d5641..b73e51c 100644
--- a/chrome/browser/dom_ui/certificate_manager_handler.cc
+++ b/chrome/browser/dom_ui/options/certificate_manager_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/certificate_manager_handler.h"
+#include "chrome/browser/dom_ui/options/certificate_manager_handler.h"
 
 #include "app/l10n_util.h"
 #include "app/l10n_util_collator.h"
diff --git a/chrome/browser/dom_ui/certificate_manager_handler.h b/chrome/browser/dom_ui/options/certificate_manager_handler.h
index 265dba4..3766b57 100644
--- a/chrome/browser/dom_ui/certificate_manager_handler.h
+++ b/chrome/browser/dom_ui/options/certificate_manager_handler.h
@@ -2,12 +2,12 @@
 // 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_CERTIFICATE_MANAGER_HANDLER_H_
-#define CHROME_BROWSER_DOM_UI_CERTIFICATE_MANAGER_HANDLER_H_
+#ifndef CHROME_BROWSER_DOM_UI_OPTIONS_CERTIFICATE_MANAGER_HANDLER_H_
+#define CHROME_BROWSER_DOM_UI_OPTIONS_CERTIFICATE_MANAGER_HANDLER_H_
 #pragma once
 
 #include "base/scoped_ptr.h"
-#include "chrome/browser/dom_ui/options_ui.h"
+#include "chrome/browser/dom_ui/options/options_ui.h"
 #include "net/base/cert_database.h"
 
 class CertificateManagerModel;
@@ -37,4 +37,4 @@ class CertificateManagerHandler : public OptionsPageUIHandler {
   DISALLOW_COPY_AND_ASSIGN(CertificateManagerHandler);
 };
 
-#endif  // CHROME_BROWSER_DOM_UI_CERTIFICATE_MANAGER_HANDLER_H_
+#endif  // CHROME_BROWSER_DOM_UI_OPTIONS_CERTIFICATE_MANAGER_HANDLER_H_
diff --git a/chrome/browser/dom_ui/clear_browser_data_handler.cc b/chrome/browser/dom_ui/options/clear_browser_data_handler.cc
index 61b1ffd..9cf4838 100644
--- a/chrome/browser/dom_ui/clear_browser_data_handler.cc
+++ b/chrome/browser/dom_ui/options/clear_browser_data_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/clear_browser_data_handler.h"
+#include "chrome/browser/dom_ui/options/clear_browser_data_handler.h"
 
 #include "app/l10n_util.h"
 #include "base/basictypes.h"
diff --git a/chrome/browser/dom_ui/clear_browser_data_handler.h b/chrome/browser/dom_ui/options/clear_browser_data_handler.h
index 7c29b79..7789bff 100644
--- a/chrome/browser/dom_ui/clear_browser_data_handler.h
+++ b/chrome/browser/dom_ui/options/clear_browser_data_handler.h
@@ -2,11 +2,11 @@
 // 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_CLEAR_BROWSER_DATA_HANDLER_H_
-#define CHROME_BROWSER_DOM_UI_CLEAR_BROWSER_DATA_HANDLER_H_
+#ifndef CHROME_BROWSER_DOM_UI_OPTIONS_CLEAR_BROWSER_DATA_HANDLER_H_
+#define CHROME_BROWSER_DOM_UI_OPTIONS_CLEAR_BROWSER_DATA_HANDLER_H_
 #pragma once
 
-#include "chrome/browser/dom_ui/options_ui.h"
+#include "chrome/browser/dom_ui/options/options_ui.h"
 #include "chrome/browser/browsing_data_remover.h"
 
 // Clear browser data handler page UI handler.
@@ -35,4 +35,4 @@ class ClearBrowserDataHandler : public OptionsPageUIHandler,
   DISALLOW_COPY_AND_ASSIGN(ClearBrowserDataHandler);
 };
 
-#endif  // CHROME_BROWSER_DOM_UI_CLEAR_BROWSER_DATA_HANDLER_H_
+#endif  // CHROME_BROWSER_DOM_UI_OPTIONS_CLEAR_BROWSER_DATA_HANDLER_H_
diff --git a/chrome/browser/dom_ui/content_settings_handler.cc b/chrome/browser/dom_ui/options/content_settings_handler.cc
index ce84717..f4b7242 100644
--- a/chrome/browser/dom_ui/content_settings_handler.cc
+++ b/chrome/browser/dom_ui/options/content_settings_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/content_settings_handler.h"
+#include "chrome/browser/dom_ui/options/content_settings_handler.h"
 
 #include "app/l10n_util.h"
 #include "base/callback.h"
diff --git a/chrome/browser/dom_ui/content_settings_handler.h b/chrome/browser/dom_ui/options/content_settings_handler.h
index f0803e0..3f915af 100644
--- a/chrome/browser/dom_ui/content_settings_handler.h
+++ b/chrome/browser/dom_ui/options/content_settings_handler.h
@@ -2,11 +2,11 @@
 // 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_CONTENT_SETTINGS_HANDLER_H_
-#define CHROME_BROWSER_DOM_UI_CONTENT_SETTINGS_HANDLER_H_
+#ifndef CHROME_BROWSER_DOM_UI_OPTIONS_CONTENT_SETTINGS_HANDLER_H_
+#define CHROME_BROWSER_DOM_UI_OPTIONS_CONTENT_SETTINGS_HANDLER_H_
 #pragma once
 
-#include "chrome/browser/dom_ui/options_ui.h"
+#include "chrome/browser/dom_ui/options/options_ui.h"
 #include "chrome/common/content_settings_types.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
@@ -51,4 +51,4 @@ class ContentSettingsHandler : public OptionsPageUIHandler {
   DISALLOW_COPY_AND_ASSIGN(ContentSettingsHandler);
 };
 
-#endif  // CHROME_BROWSER_DOM_UI_CONTENT_SETTINGS_HANDLER_H_
+#endif  // CHROME_BROWSER_DOM_UI_OPTIONS_CONTENT_SETTINGS_HANDLER_H_
diff --git a/chrome/browser/dom_ui/cookies_view_handler.cc b/chrome/browser/dom_ui/options/cookies_view_handler.cc
index 06c9808..ebc1e94 100644
--- a/chrome/browser/dom_ui/cookies_view_handler.cc
+++ b/chrome/browser/dom_ui/options/cookies_view_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/cookies_view_handler.h"
+#include "chrome/browser/dom_ui/options/cookies_view_handler.h"
 
 #include "app/l10n_util.h"
 #include "base/i18n/time_formatting.h"
diff --git a/chrome/browser/dom_ui/cookies_view_handler.h b/chrome/browser/dom_ui/options/cookies_view_handler.h
index 662a891..8c8d0fd 100644
--- a/chrome/browser/dom_ui/cookies_view_handler.h
+++ b/chrome/browser/dom_ui/options/cookies_view_handler.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_COOKIES_VIEW_HANDLER_H_
-#define CHROME_BROWSER_DOM_UI_COOKIES_VIEW_HANDLER_H_
+#ifndef CHROME_BROWSER_DOM_UI_OPTIONS_COOKIES_VIEW_HANDLER_H_
+#define CHROME_BROWSER_DOM_UI_OPTIONS_COOKIES_VIEW_HANDLER_H_
 #pragma once
 
 #include "base/scoped_ptr.h"
 #include "chrome/browser/cookies_tree_model.h"
-#include "chrome/browser/dom_ui/options_ui.h"
+#include "chrome/browser/dom_ui/options/options_ui.h"
 
 class CookiesViewHandler : public OptionsPageUIHandler,
                            public CookiesTreeModel::Observer {
@@ -48,4 +48,4 @@ class CookiesViewHandler : public OptionsPageUIHandler,
   DISALLOW_COPY_AND_ASSIGN(CookiesViewHandler);
 };
 
-#endif  // CHROME_BROWSER_DOM_UI_COOKIES_VIEW_HANDLER_H_
+#endif  // CHROME_BROWSER_DOM_UI_OPTIONS_COOKIES_VIEW_HANDLER_H_
diff --git a/chrome/browser/dom_ui/core_options_handler.cc b/chrome/browser/dom_ui/options/core_options_handler.cc
index 849e768b..cb19ceb 100644
--- a/chrome/browser/dom_ui/core_options_handler.cc
+++ b/chrome/browser/dom_ui/options/core_options_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/core_options_handler.h"
+#include "chrome/browser/dom_ui/options/core_options_handler.h"
 
 #include "app/l10n_util.h"
 #include "base/string16.h"
diff --git a/chrome/browser/dom_ui/core_options_handler.h b/chrome/browser/dom_ui/options/core_options_handler.h
index fd94d10..42dcc23 100644
--- a/chrome/browser/dom_ui/core_options_handler.h
+++ b/chrome/browser/dom_ui/options/core_options_handler.h
@@ -2,15 +2,15 @@
 // 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_CORE_OPTIONS_HANDLER_H_
-#define CHROME_BROWSER_DOM_UI_CORE_OPTIONS_HANDLER_H_
+#ifndef CHROME_BROWSER_DOM_UI_OPTIONS_CORE_OPTIONS_HANDLER_H_
+#define CHROME_BROWSER_DOM_UI_OPTIONS_CORE_OPTIONS_HANDLER_H_
 #pragma once
 
 #include <map>
 #include <string>
 
 #include "base/values.h"
-#include "chrome/browser/dom_ui/options_ui.h"
+#include "chrome/browser/dom_ui/options/options_ui.h"
 #include "chrome/browser/prefs/pref_change_registrar.h"
 
 // Core options UI handler.
@@ -93,4 +93,4 @@ class CoreOptionsHandler : public OptionsPageUIHandler {
   DISALLOW_COPY_AND_ASSIGN(CoreOptionsHandler);
 };
 
-#endif  // CHROME_BROWSER_DOM_UI_CORE_OPTIONS_HANDLER_H_
+#endif  // CHROME_BROWSER_DOM_UI_OPTIONS_CORE_OPTIONS_HANDLER_H_
diff --git a/chrome/browser/dom_ui/font_settings_handler.cc b/chrome/browser/dom_ui/options/font_settings_handler.cc
index fd5d955..2ae0d9f 100644
--- a/chrome/browser/dom_ui/font_settings_handler.cc
+++ b/chrome/browser/dom_ui/options/font_settings_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/font_settings_handler.h"
+#include "chrome/browser/dom_ui/options/font_settings_handler.h"
 
 #include "app/l10n_util.h"
 #include "base/basictypes.h"
@@ -10,7 +10,7 @@
 #include "base/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/character_encoding.h"
-#include "chrome/browser/dom_ui/font_settings_utils.h"
+#include "chrome/browser/dom_ui/options/font_settings_utils.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/common/notification_service.h"
@@ -156,4 +156,3 @@ void FontSettingsHandler::SetupFixedFontPreview() {
   dom_ui_->CallJavascriptFunction(
       L"FontSettings.setupFixedFontPreview", font_value, size_value);
 }
-
diff --git a/chrome/browser/dom_ui/font_settings_handler.h b/chrome/browser/dom_ui/options/font_settings_handler.h
index 512be16..c3e72c8 100644
--- a/chrome/browser/dom_ui/font_settings_handler.h
+++ b/chrome/browser/dom_ui/options/font_settings_handler.h
@@ -2,11 +2,11 @@
 // 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_FONT_SETTINGS_HANDLER_H_
-#define CHROME_BROWSER_DOM_UI_FONT_SETTINGS_HANDLER_H_
+#ifndef CHROME_BROWSER_DOM_UI_OPTIONS_FONT_SETTINGS_HANDLER_H_
+#define CHROME_BROWSER_DOM_UI_OPTIONS_FONT_SETTINGS_HANDLER_H_
 #pragma once
 
-#include "chrome/browser/dom_ui/options_ui.h"
+#include "chrome/browser/dom_ui/options/options_ui.h"
 #include "chrome/browser/prefs/pref_member.h"
 
 // Font settings overlay page UI handler.
@@ -41,5 +41,4 @@ class FontSettingsHandler : public OptionsPageUIHandler {
   DISALLOW_COPY_AND_ASSIGN(FontSettingsHandler);
 };
 
-#endif  // CHROME_BROWSER_DOM_UI_FONT_SETTINGS_HANDLER_H_
-
+#endif  // CHROME_BROWSER_DOM_UI_OPTIONS_FONT_SETTINGS_HANDLER_H_
diff --git a/chrome/browser/dom_ui/font_settings_utils.h b/chrome/browser/dom_ui/options/font_settings_utils.h
index 2d0d036..5ac232c 100644
--- a/chrome/browser/dom_ui/font_settings_utils.h
+++ b/chrome/browser/dom_ui/options/font_settings_utils.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_FONT_SETTINGS_UTILS_H_
-#define CHROME_BROWSER_DOM_UI_FONT_SETTINGS_UTILS_H_
+#ifndef CHROME_BROWSER_DOM_UI_OPTIONS_FONT_SETTINGS_UTILS_H_
+#define CHROME_BROWSER_DOM_UI_OPTIONS_FONT_SETTINGS_UTILS_H_
 #pragma once
 
 #include "base/basictypes.h"
@@ -22,5 +22,4 @@ class FontSettingsUtilities {
   DISALLOW_IMPLICIT_CONSTRUCTORS(FontSettingsUtilities);
 };
 
-#endif  // CHROME_BROWSER_DOM_UI_FONT_SETTINGS_UTILS_H_
-
+#endif  // CHROME_BROWSER_DOM_UI_OPTIONS_FONT_SETTINGS_UTILS_H_
diff --git a/chrome/browser/dom_ui/font_settings_utils_gtk.cc b/chrome/browser/dom_ui/options/font_settings_utils_gtk.cc
index 82917b4..2833fdf 100644
--- a/chrome/browser/dom_ui/font_settings_utils_gtk.cc
+++ b/chrome/browser/dom_ui/options/font_settings_utils_gtk.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/font_settings_utils.h"
+#include "chrome/browser/dom_ui/options/font_settings_utils.h"
 
 #include <pango/pango.h>
 #include <pango/pangocairo.h>
diff --git a/chrome/browser/dom_ui/font_settings_utils_mac.mm b/chrome/browser/dom_ui/options/font_settings_utils_mac.mm
index e57bdb7..bfdff36 100644
--- a/chrome/browser/dom_ui/font_settings_utils_mac.mm
+++ b/chrome/browser/dom_ui/options/font_settings_utils_mac.mm
@@ -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/font_settings_utils.h"
+#include "chrome/browser/dom_ui/options/font_settings_utils.h"
 
 #import <Cocoa/Cocoa.h>
 
diff --git a/chrome/browser/dom_ui/font_settings_utils_win.cc b/chrome/browser/dom_ui/options/font_settings_utils_win.cc
index 66be7b5..482e6e1 100644
--- a/chrome/browser/dom_ui/font_settings_utils_win.cc
+++ b/chrome/browser/dom_ui/options/font_settings_utils_win.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/font_settings_utils.h"
+#include "chrome/browser/dom_ui/options/font_settings_utils.h"
 
 #include <windows.h>
 
diff --git a/chrome/browser/dom_ui/import_data_handler.cc b/chrome/browser/dom_ui/options/import_data_handler.cc
index 0cf574c..d57e616 100644
--- a/chrome/browser/dom_ui/import_data_handler.cc
+++ b/chrome/browser/dom_ui/options/import_data_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/import_data_handler.h"
+#include "chrome/browser/dom_ui/options/import_data_handler.h"
 
 #include "app/l10n_util.h"
 #include "base/basictypes.h"
diff --git a/chrome/browser/dom_ui/import_data_handler.h b/chrome/browser/dom_ui/options/import_data_handler.h
index 4f28d7b..1c7b872 100644
--- a/chrome/browser/dom_ui/import_data_handler.h
+++ b/chrome/browser/dom_ui/options/import_data_handler.h
@@ -2,10 +2,10 @@
 // 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_IMPORT_DATA_HANDLER_H_
-#define CHROME_BROWSER_DOM_UI_IMPORT_DATA_HANDLER_H_
+#ifndef CHROME_BROWSER_DOM_UI_OPTIONS_IMPORT_DATA_HANDLER_H_
+#define CHROME_BROWSER_DOM_UI_OPTIONS_IMPORT_DATA_HANDLER_H_
 
-#include "chrome/browser/dom_ui/options_ui.h"
+#include "chrome/browser/dom_ui/options/options_ui.h"
 #include "chrome/browser/importer/importer.h"
 
 // Chrome personal stuff import data overlay UI handler.
@@ -40,4 +40,4 @@ class ImportDataHandler : public OptionsPageUIHandler,
   DISALLOW_COPY_AND_ASSIGN(ImportDataHandler);
 };
 
-#endif  // CHROME_BROWSER_DOM_UI_IMPORT_DATA_HANDLER_H_
+#endif  // CHROME_BROWSER_DOM_UI_OPTIONS_IMPORT_DATA_HANDLER_H_
diff --git a/chrome/browser/dom_ui/options_managed_banner_handler.cc b/chrome/browser/dom_ui/options/options_managed_banner_handler.cc
index d3d9973..2f802f4 100644
--- a/chrome/browser/dom_ui/options_managed_banner_handler.cc
+++ b/chrome/browser/dom_ui/options/options_managed_banner_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/options_managed_banner_handler.h"
+#include "chrome/browser/dom_ui/options/options_managed_banner_handler.h"
 
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
diff --git a/chrome/browser/dom_ui/options_managed_banner_handler.h b/chrome/browser/dom_ui/options/options_managed_banner_handler.h
index 13d4c82..b03bed2 100644
--- a/chrome/browser/dom_ui/options_managed_banner_handler.h
+++ b/chrome/browser/dom_ui/options/options_managed_banner_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_OPTIONS_MANAGED_BANNER_HANDLER_H_
-#define CHROME_BROWSER_DOM_UI_OPTIONS_MANAGED_BANNER_HANDLER_H_
+#ifndef CHROME_BROWSER_DOM_UI_OPTIONS_OPTIONS_MANAGED_BANNER_HANDLER_H_
+#define CHROME_BROWSER_DOM_UI_OPTIONS_OPTIONS_MANAGED_BANNER_HANDLER_H_
 #pragma once
 
 #include "chrome/browser/policy/managed_prefs_banner_base.h"
@@ -35,4 +35,4 @@ class OptionsManagedBannerHandler : public policy::ManagedPrefsBannerBase {
   DISALLOW_COPY_AND_ASSIGN(OptionsManagedBannerHandler);
 };
 
-#endif  // CHROME_BROWSER_DOM_UI_OPTIONS_MANAGED_BANNER_HANDLER_H_
+#endif  // CHROME_BROWSER_DOM_UI_OPTIONS_OPTIONS_MANAGED_BANNER_HANDLER_H_
diff --git a/chrome/browser/dom_ui/options_ui.cc b/chrome/browser/dom_ui/options/options_ui.cc
index 882fdc9..e182b28 100644
--- a/chrome/browser/dom_ui/options_ui.cc
+++ b/chrome/browser/dom_ui/options/options_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/options_ui.h"
+#include "chrome/browser/dom_ui/options/options_ui.h"
 
 #include <algorithm>
 
@@ -16,22 +16,22 @@
 #include "base/time.h"
 #include "base/values.h"
 #include "chrome/browser/chrome_thread.h"
-#include "chrome/browser/dom_ui/about_page_handler.h"
-#include "chrome/browser/dom_ui/add_startup_page_handler.h"
-#include "chrome/browser/dom_ui/advanced_options_handler.h"
-#include "chrome/browser/dom_ui/autofill_options_handler.h"
-#include "chrome/browser/dom_ui/browser_options_handler.h"
-#include "chrome/browser/dom_ui/clear_browser_data_handler.h"
-#include "chrome/browser/dom_ui/content_settings_handler.h"
-#include "chrome/browser/dom_ui/cookies_view_handler.h"
-#include "chrome/browser/dom_ui/core_options_handler.h"
 #include "chrome/browser/dom_ui/dom_ui_theme_source.h"
-#include "chrome/browser/dom_ui/font_settings_handler.h"
-#include "chrome/browser/dom_ui/import_data_handler.h"
-#include "chrome/browser/dom_ui/passwords_exceptions_handler.h"
-#include "chrome/browser/dom_ui/personal_options_handler.h"
-#include "chrome/browser/dom_ui/search_engine_manager_handler.h"
-#include "chrome/browser/dom_ui/sync_options_handler.h"
+#include "chrome/browser/dom_ui/options/about_page_handler.h"
+#include "chrome/browser/dom_ui/options/add_startup_page_handler.h"
+#include "chrome/browser/dom_ui/options/advanced_options_handler.h"
+#include "chrome/browser/dom_ui/options/autofill_options_handler.h"
+#include "chrome/browser/dom_ui/options/browser_options_handler.h"
+#include "chrome/browser/dom_ui/options/clear_browser_data_handler.h"
+#include "chrome/browser/dom_ui/options/content_settings_handler.h"
+#include "chrome/browser/dom_ui/options/cookies_view_handler.h"
+#include "chrome/browser/dom_ui/options/core_options_handler.h"
+#include "chrome/browser/dom_ui/options/font_settings_handler.h"
+#include "chrome/browser/dom_ui/options/import_data_handler.h"
+#include "chrome/browser/dom_ui/options/passwords_exceptions_handler.h"
+#include "chrome/browser/dom_ui/options/personal_options_handler.h"
+#include "chrome/browser/dom_ui/options/search_engine_manager_handler.h"
+#include "chrome/browser/dom_ui/options/sync_options_handler.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profile.h"
@@ -66,7 +66,7 @@
 #endif
 
 #if defined(USE_NSS)
-#include "chrome/browser/dom_ui/certificate_manager_handler.h"
+#include "chrome/browser/dom_ui/options/certificate_manager_handler.h"
 #endif
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/chrome/browser/dom_ui/options_ui.h b/chrome/browser/dom_ui/options/options_ui.h
index 92817e2..98d3d1b8 100644
--- a/chrome/browser/dom_ui/options_ui.h
+++ b/chrome/browser/dom_ui/options/options_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_OPTIONS_UI_H_
-#define CHROME_BROWSER_DOM_UI_OPTIONS_UI_H_
+#ifndef CHROME_BROWSER_DOM_UI_OPTIONS_OPTIONS_UI_H_
+#define CHROME_BROWSER_DOM_UI_OPTIONS_OPTIONS_UI_H_
 #pragma once
 
 #include <string>
@@ -90,4 +90,4 @@ class OptionsUI : public DOMUI {
   DISALLOW_COPY_AND_ASSIGN(OptionsUI);
 };
 
-#endif  // CHROME_BROWSER_DOM_UI_OPTIONS_UI_H_
+#endif  // CHROME_BROWSER_DOM_UI_OPTIONS_OPTIONS_UI_H_
diff --git a/chrome/browser/dom_ui/options_ui_uitest.cc b/chrome/browser/dom_ui/options/options_ui_uitest.cc
index 42d00a3..42d00a3 100644
--- a/chrome/browser/dom_ui/options_ui_uitest.cc
+++ b/chrome/browser/dom_ui/options/options_ui_uitest.cc
diff --git a/chrome/browser/dom_ui/passwords_exceptions_handler.cc b/chrome/browser/dom_ui/options/passwords_exceptions_handler.cc
index c26546a..0e12d9f 100644
--- a/chrome/browser/dom_ui/passwords_exceptions_handler.cc
+++ b/chrome/browser/dom_ui/options/passwords_exceptions_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/passwords_exceptions_handler.h"
+#include "chrome/browser/dom_ui/options/passwords_exceptions_handler.h"
 
 #include "app/l10n_util.h"
 #include "base/callback.h"
diff --git a/chrome/browser/dom_ui/passwords_exceptions_handler.h b/chrome/browser/dom_ui/options/passwords_exceptions_handler.h
index fca125a..7ad0c64 100644
--- a/chrome/browser/dom_ui/passwords_exceptions_handler.h
+++ b/chrome/browser/dom_ui/options/passwords_exceptions_handler.h
@@ -2,10 +2,10 @@
 // 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_PASSWORDS_EXCEPTIONS_HANDLER_H_
-#define CHROME_BROWSER_DOM_UI_PASSWORDS_EXCEPTIONS_HANDLER_H_
+#ifndef CHROME_BROWSER_DOM_UI_OPTIONS_PASSWORDS_EXCEPTIONS_HANDLER_H_
+#define CHROME_BROWSER_DOM_UI_OPTIONS_PASSWORDS_EXCEPTIONS_HANDLER_H_
 
-#include "chrome/browser/dom_ui/options_ui.h"
+#include "chrome/browser/dom_ui/options/options_ui.h"
 #include "chrome/browser/password_manager/password_store.h"
 #include "chrome/browser/profile.h"
 
@@ -117,4 +117,4 @@ class PasswordsExceptionsHandler : public OptionsPageUIHandler {
   DISALLOW_COPY_AND_ASSIGN(PasswordsExceptionsHandler);
 };
 
-#endif  // CHROME_BROWSER_DOM_UI_PASSWORDS_EXCEPTIONS_HANDLER_H_
+#endif  // CHROME_BROWSER_DOM_UI_OPTIONS_PASSWORDS_EXCEPTIONS_HANDLER_H_
diff --git a/chrome/browser/dom_ui/personal_options_handler.cc b/chrome/browser/dom_ui/options/personal_options_handler.cc
index 095ca52..9e4f398 100644
--- a/chrome/browser/dom_ui/personal_options_handler.cc
+++ b/chrome/browser/dom_ui/options/personal_options_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/personal_options_handler.h"
+#include "chrome/browser/dom_ui/options/personal_options_handler.h"
 
 #include "app/l10n_util.h"
 #include "base/basictypes.h"
@@ -14,7 +14,7 @@
 #include "build/build_config.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/dom_ui/options_managed_banner_handler.h"
+#include "chrome/browser/dom_ui/options/options_managed_banner_handler.h"
 #if defined(TOOLKIT_GTK)
 #include "chrome/browser/gtk/gtk_theme_provider.h"
 #endif  // defined(TOOLKIT_GTK)
diff --git a/chrome/browser/dom_ui/personal_options_handler.h b/chrome/browser/dom_ui/options/personal_options_handler.h
index 94ad35b..235f0d5 100644
--- a/chrome/browser/dom_ui/personal_options_handler.h
+++ b/chrome/browser/dom_ui/options/personal_options_handler.h
@@ -2,11 +2,11 @@
 // 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_PERSONAL_OPTIONS_HANDLER_H_
-#define CHROME_BROWSER_DOM_UI_PERSONAL_OPTIONS_HANDLER_H_
+#ifndef CHROME_BROWSER_DOM_UI_OPTIONS_PERSONAL_OPTIONS_HANDLER_H_
+#define CHROME_BROWSER_DOM_UI_OPTIONS_PERSONAL_OPTIONS_HANDLER_H_
 #pragma once
 
-#include "chrome/browser/dom_ui/options_ui.h"
+#include "chrome/browser/dom_ui/options/options_ui.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 
 class OptionsManagedBannerHandler;
@@ -43,4 +43,4 @@ class PersonalOptionsHandler : public OptionsPageUIHandler {
   DISALLOW_COPY_AND_ASSIGN(PersonalOptionsHandler);
 };
 
-#endif  // CHROME_BROWSER_DOM_UI_PERSONAL_OPTIONS_HANDLER_H_
+#endif  // CHROME_BROWSER_DOM_UI_OPTIONS_PERSONAL_OPTIONS_HANDLER_H_
diff --git a/chrome/browser/dom_ui/search_engine_manager_handler.cc b/chrome/browser/dom_ui/options/search_engine_manager_handler.cc
index 26941d7..d3a407a 100644
--- a/chrome/browser/dom_ui/search_engine_manager_handler.cc
+++ b/chrome/browser/dom_ui/options/search_engine_manager_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/search_engine_manager_handler.h"
+#include "chrome/browser/dom_ui/options/search_engine_manager_handler.h"
 
 #include "app/l10n_util.h"
 #include "base/callback.h"
diff --git a/chrome/browser/dom_ui/search_engine_manager_handler.h b/chrome/browser/dom_ui/options/search_engine_manager_handler.h
index add15e4..f837d38f3 100644
--- a/chrome/browser/dom_ui/search_engine_manager_handler.h
+++ b/chrome/browser/dom_ui/options/search_engine_manager_handler.h
@@ -2,11 +2,11 @@
 // 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_SEARCH_ENGINE_MANAGER_HANDLER_H_
-#define CHROME_BROWSER_DOM_UI_SEARCH_ENGINE_MANAGER_HANDLER_H_
+#ifndef CHROME_BROWSER_DOM_UI_OPTIONS_SEARCH_ENGINE_MANAGER_HANDLER_H_
+#define CHROME_BROWSER_DOM_UI_OPTIONS_SEARCH_ENGINE_MANAGER_HANDLER_H_
 
 #include "app/table_model_observer.h"
-#include "chrome/browser/dom_ui/options_ui.h"
+#include "chrome/browser/dom_ui/options/options_ui.h"
 #include "chrome/browser/search_engines/edit_search_engine_controller.h"
 
 class KeywordEditorController;
@@ -72,4 +72,4 @@ class SearchEngineManagerHandler : public OptionsPageUIHandler,
   DISALLOW_COPY_AND_ASSIGN(SearchEngineManagerHandler);
 };
 
-#endif  // CHROME_BROWSER_DOM_UI_SEARCH_ENGINE_MANAGER_HANDLER_H_
+#endif  // CHROME_BROWSER_DOM_UI_OPTIONS_SEARCH_ENGINE_MANAGER_HANDLER_H_
diff --git a/chrome/browser/dom_ui/sync_options_handler.cc b/chrome/browser/dom_ui/options/sync_options_handler.cc
index ec6a233..3bc1207 100644
--- a/chrome/browser/dom_ui/sync_options_handler.cc
+++ b/chrome/browser/dom_ui/options/sync_options_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/sync_options_handler.h"
+#include "chrome/browser/dom_ui/options/sync_options_handler.h"
 
 #include "app/l10n_util.h"
 #include "base/basictypes.h"
diff --git a/chrome/browser/dom_ui/sync_options_handler.h b/chrome/browser/dom_ui/options/sync_options_handler.h
index 76de737..bf7f046 100644
--- a/chrome/browser/dom_ui/sync_options_handler.h
+++ b/chrome/browser/dom_ui/options/sync_options_handler.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_DOM_UI_SYNC_OPTIONS_HANDLER_H_
-#define CHROME_BROWSER_DOM_UI_SYNC_OPTIONS_HANDLER_H_
+#ifndef CHROME_BROWSER_DOM_UI_OPTIONS_SYNC_OPTIONS_HANDLER_H_
+#define CHROME_BROWSER_DOM_UI_OPTIONS_SYNC_OPTIONS_HANDLER_H_
 #pragma once
 
-#include "chrome/browser/dom_ui/options_ui.h"
+#include "chrome/browser/dom_ui/options/options_ui.h"
 
 // Chrome sync options page UI handler.
 class SyncOptionsHandler : public OptionsPageUIHandler {
@@ -27,4 +27,4 @@ class SyncOptionsHandler : public OptionsPageUIHandler {
   DISALLOW_COPY_AND_ASSIGN(SyncOptionsHandler);
 };
 
-#endif  // CHROME_BROWSER_DOM_UI_SYNC_OPTIONS_HANDLER_H_
+#endif  // CHROME_BROWSER_DOM_UI_OPTIONS_SYNC_OPTIONS_HANDLER_H_
diff --git a/chrome/browser/dom_ui/passwords_remove_all_handler.cc b/chrome/browser/dom_ui/passwords_remove_all_handler.cc
deleted file mode 100644
index ecf15a6..0000000
--- a/chrome/browser/dom_ui/passwords_remove_all_handler.cc
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright (c) 2010 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/passwords_remove_all_handler.h"
-
-#include "app/l10n_util.h"
-#include "base/basictypes.h"
-#include "base/values.h"
-#include "base/callback.h"
-#include "grit/chromium_strings.h"
-#include "grit/generated_resources.h"
-#include "chrome/browser/sync/profile_sync_service.h"
-#include "chrome/browser/profile.h"
-#include "chrome/browser/profile_manager.h"
-#include "chrome/browser/dom_ui/passwords_exceptions_handler.h"
-
-PasswordsRemoveAllHandler::PasswordsRemoveAllHandler() {
-}
-
-PasswordsRemoveAllHandler::~PasswordsRemoveAllHandler() {
-}
-
-void PasswordsRemoveAllHandler::GetLocalizedValues(
-    DictionaryValue* localized_strings) {
-  DCHECK(localized_strings);
-  localized_strings->SetString("remove_all_explanation",
-      l10n_util::GetStringUTF16(
-      IDS_PASSWORDS_PAGE_VIEW_TEXT_DELETE_ALL_PASSWORDS));
-  localized_strings->SetString("remove_all_title",
-      l10n_util::GetStringUTF16(
-      IDS_PASSWORDS_PAGE_VIEW_CAPTION_DELETE_ALL_PASSWORDS));
-  localized_strings->SetString("remove_all_yes",
-      l10n_util::GetStringUTF16(IDS_CONFIRM_MESSAGEBOX_YES_BUTTON_LABEL));
-  localized_strings->SetString("remove_all_no",
-      l10n_util::GetStringUTF16(IDS_CONFIRM_MESSAGEBOX_NO_BUTTON_LABEL));
-}
-
-void PasswordsRemoveAllHandler::RegisterMessages() {
-  DCHECK(dom_ui_);
-}
diff --git a/chrome/browser/dom_ui/passwords_remove_all_handler.h b/chrome/browser/dom_ui/passwords_remove_all_handler.h
deleted file mode 100644
index 08795c1..0000000
--- a/chrome/browser/dom_ui/passwords_remove_all_handler.h
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) 2010 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_PASSWORDS_REMOVE_ALL_HANDLER_H_
-#define CHROME_BROWSER_DOM_UI_PASSWORDS_REMOVE_ALL_HANDLER_H_
-
-#include "chrome/browser/dom_ui/options_ui.h"
-
-// Chrome passwords and exceptions remove all overlay UI handler.
-class PasswordsRemoveAllHandler : public OptionsPageUIHandler {
- public:
-  PasswordsRemoveAllHandler();
-  virtual ~PasswordsRemoveAllHandler();
-
-  // OptionsUIHandler implementation.
-  virtual void GetLocalizedValues(DictionaryValue* localized_strings);
-
-  // DOMMessageHandler implementation.
-  virtual void RegisterMessages();
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(PasswordsRemoveAllHandler);
-};
-
-#endif  // CHROME_BROWSER_DOM_UI_PASSWORDSREMOVE_ALL_HANDLER_H_