68 files changed, 209 insertions, 209 deletions

diff --git a/chrome/browser/chromeos/webui/accounts_options_handler.cc b/chrome/browser/chromeos/webui/accounts_options_handler.cc
index d1a4d1d..75b5115 100644
--- a/chrome/browser/chromeos/webui/accounts_options_handler.cc
+++ b/chrome/browser/chromeos/webui/accounts_options_handler.cc
@@ -11,7 +11,7 @@
 #include "chrome/browser/chromeos/login/authenticator.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/user_cros_settings_provider.h"
-#include "chrome/browser/webui/options/options_managed_banner_handler.h"
+#include "chrome/browser/ui/webui/options/options_managed_banner_handler.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/webui/web_ui_util.h"
 #include "grit/generated_resources.h"
diff --git a/chrome/browser/chromeos/webui/core_chromeos_options_handler.h b/chrome/browser/chromeos/webui/core_chromeos_options_handler.h
index bfa9aee..0b2b826 100644
--- a/chrome/browser/chromeos/webui/core_chromeos_options_handler.h
+++ b/chrome/browser/chromeos/webui/core_chromeos_options_handler.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_CHROMEOS_WEBUI_CORE_CHROMEOS_OPTIONS_HANDLER_H_
 #pragma once
 
-#include "chrome/browser/webui/options/core_options_handler.h"
+#include "chrome/browser/ui/webui/options/core_options_handler.h"
 
 namespace chromeos {
 
diff --git a/chrome/browser/chromeos/webui/cros_language_options_handler.h b/chrome/browser/chromeos/webui/cros_language_options_handler.h
index bf0eba8..111fe3f 100644
--- a/chrome/browser/chromeos/webui/cros_language_options_handler.h
+++ b/chrome/browser/chromeos/webui/cros_language_options_handler.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
-#include "chrome/browser/webui/options/language_options_handler.h"
+#include "chrome/browser/ui/webui/options/language_options_handler.h"
 
 namespace chromeos {
 
diff --git a/chrome/browser/chromeos/webui/cros_options_page_ui_handler.h b/chrome/browser/chromeos/webui/cros_options_page_ui_handler.h
index ece323e..92c0982 100644
--- a/chrome/browser/chromeos/webui/cros_options_page_ui_handler.h
+++ b/chrome/browser/chromeos/webui/cros_options_page_ui_handler.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include "chrome/browser/chromeos/cros_settings_provider.h"
-#include "chrome/browser/webui/options/options_ui.h"
+#include "chrome/browser/ui/webui/options/options_ui.h"
 
 namespace chromeos {
 
diff --git a/chrome/browser/chromeos/webui/internet_options_handler.h b/chrome/browser/chromeos/webui/internet_options_handler.h
index c5d6d68..83da94a 100644
--- a/chrome/browser/chromeos/webui/internet_options_handler.h
+++ b/chrome/browser/chromeos/webui/internet_options_handler.h
@@ -8,7 +8,7 @@
 #include <string>
 
 #include "chrome/browser/chromeos/cros/network_library.h"
-#include "chrome/browser/webui/options/options_ui.h"
+#include "chrome/browser/ui/webui/options/options_ui.h"
 
 class SkBitmap;
 namespace views {
diff --git a/chrome/browser/chromeos/webui/language_chewing_options_handler.h b/chrome/browser/chromeos/webui/language_chewing_options_handler.h
index 24228cb..c243d67 100644
--- a/chrome/browser/chromeos/webui/language_chewing_options_handler.h
+++ b/chrome/browser/chromeos/webui/language_chewing_options_handler.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_CHROMEOS_WEBUI_LANGUAGE_CHEWING_OPTIONS_HANDLER_H_
 #pragma once
 
-#include "chrome/browser/webui/options/options_ui.h"
+#include "chrome/browser/ui/webui/options/options_ui.h"
 
 class DictionaryValue;
 
diff --git a/chrome/browser/chromeos/webui/language_customize_modifier_keys_handler.h b/chrome/browser/chromeos/webui/language_customize_modifier_keys_handler.h
index 0a9fd93..643afb1 100644
--- a/chrome/browser/chromeos/webui/language_customize_modifier_keys_handler.h
+++ b/chrome/browser/chromeos/webui/language_customize_modifier_keys_handler.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include "chrome/browser/prefs/pref_member.h"
-#include "chrome/browser/webui/options/options_ui.h"
+#include "chrome/browser/ui/webui/options/options_ui.h"
 
 namespace chromeos {
 
diff --git a/chrome/browser/chromeos/webui/language_hangul_options_handler.h b/chrome/browser/chromeos/webui/language_hangul_options_handler.h
index 7cf873e..3fe469f 100644
--- a/chrome/browser/chromeos/webui/language_hangul_options_handler.h
+++ b/chrome/browser/chromeos/webui/language_hangul_options_handler.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_CHROMEOS_WEBUI_LANGUAGE_HANGUL_OPTIONS_HANDLER_H_
 #pragma once
 
-#include "chrome/browser/webui/options/options_ui.h"
+#include "chrome/browser/ui/webui/options/options_ui.h"
 
 class DictionaryValue;
 class ListValue;
diff --git a/chrome/browser/chromeos/webui/language_mozc_options_handler.h b/chrome/browser/chromeos/webui/language_mozc_options_handler.h
index 8bf7c6e..4db0b39 100644
--- a/chrome/browser/chromeos/webui/language_mozc_options_handler.h
+++ b/chrome/browser/chromeos/webui/language_mozc_options_handler.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_CHROMEOS_WEBUI_LANGUAGE_MOZC_OPTIONS_HANDLER_H_
 #pragma once
 
-#include "chrome/browser/webui/options/options_ui.h"
+#include "chrome/browser/ui/webui/options/options_ui.h"
 
 class DictionaryValue;
 
diff --git a/chrome/browser/chromeos/webui/language_pinyin_options_handler.h b/chrome/browser/chromeos/webui/language_pinyin_options_handler.h
index 335cc89..9a5c378 100644
--- a/chrome/browser/chromeos/webui/language_pinyin_options_handler.h
+++ b/chrome/browser/chromeos/webui/language_pinyin_options_handler.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_CHROMEOS_WEBUI_LANGUAGE_PINYIN_OPTIONS_HANDLER_H_
 #pragma once
 
-#include "chrome/browser/webui/options/options_ui.h"
+#include "chrome/browser/ui/webui/options/options_ui.h"
 
 class DictionaryValue;
 
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index f88640b..11ac457 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -84,12 +84,12 @@
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/tabs/dock_info.h"
 #include "chrome/browser/ui/tabs/tab_menu_model.h"
+#include "chrome/browser/ui/webui/options/content_settings_handler.h"
 #include "chrome/browser/ui/window_sizer.h"
 #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/browser/webui/options/content_settings_handler.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/content_restriction.h"
diff --git a/chrome/browser/webui/options/OWNERS b/chrome/browser/ui/webui/options/OWNERS
index 67257e6..67257e6 100644
--- a/chrome/browser/webui/options/OWNERS
+++ b/chrome/browser/ui/webui/options/OWNERS
diff --git a/chrome/browser/webui/options/about_page_handler.cc b/chrome/browser/ui/webui/options/about_page_handler.cc
index bc7cb34..7e96e51 100644
--- a/chrome/browser/webui/options/about_page_handler.cc
+++ b/chrome/browser/ui/webui/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/webui/options/about_page_handler.h"
+#include "chrome/browser/ui/webui/options/about_page_handler.h"
 
 #include <vector>
 
diff --git a/chrome/browser/webui/options/about_page_handler.h b/chrome/browser/ui/webui/options/about_page_handler.h
index 0274960..7199fd1 100644
--- a/chrome/browser/webui/options/about_page_handler.h
+++ b/chrome/browser/ui/webui/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_WEBUI_OPTIONS_ABOUT_PAGE_HANDLER_H_
-#define CHROME_BROWSER_WEBUI_OPTIONS_ABOUT_PAGE_HANDLER_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_ABOUT_PAGE_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS_ABOUT_PAGE_HANDLER_H_
 
 #include <string>
 
-#include "chrome/browser/webui/options/options_ui.h"
+#include "chrome/browser/ui/webui/options/options_ui.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/cros/update_library.h"
@@ -62,4 +62,4 @@ class AboutPageHandler : public OptionsPageUIHandler {
   DISALLOW_COPY_AND_ASSIGN(AboutPageHandler);
 };
 
-#endif  // CHROME_BROWSER_WEBUI_OPTIONS_ABOUT_PAGE_HANDLER_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS_ABOUT_PAGE_HANDLER_H_
diff --git a/chrome/browser/webui/options/add_startup_page_handler.cc b/chrome/browser/ui/webui/options/add_startup_page_handler.cc
index ed0491f..9bd8efb 100644
--- a/chrome/browser/webui/options/add_startup_page_handler.cc
+++ b/chrome/browser/ui/webui/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/webui/options/add_startup_page_handler.h"
+#include "chrome/browser/ui/webui/options/add_startup_page_handler.h"
 
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
diff --git a/chrome/browser/webui/options/add_startup_page_handler.h b/chrome/browser/ui/webui/options/add_startup_page_handler.h
index ecce3bf..63c1d6f 100644
--- a/chrome/browser/webui/options/add_startup_page_handler.h
+++ b/chrome/browser/ui/webui/options/add_startup_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_WEBUI_OPTIONS_ADD_STARTUP_PAGE_HANDLER_H_
-#define CHROME_BROWSER_WEBUI_OPTIONS_ADD_STARTUP_PAGE_HANDLER_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_ADD_STARTUP_PAGE_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS_ADD_STARTUP_PAGE_HANDLER_H_
 #pragma once
 
 #include "base/basictypes.h"
-#include "chrome/browser/webui/options/options_ui.h"
+#include "chrome/browser/ui/webui/options/options_ui.h"
 #include "ui/base/models/table_model_observer.h"
 
 class PossibleURLModel;
@@ -40,4 +40,4 @@ class AddStartupPageHandler : public OptionsPageUIHandler,
   DISALLOW_COPY_AND_ASSIGN(AddStartupPageHandler);
 };
 
-#endif  // CHROME_BROWSER_WEBUI_OPTIONS_ADD_STARTUP_PAGE_HANDLER_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS_ADD_STARTUP_PAGE_HANDLER_H_
diff --git a/chrome/browser/webui/options/advanced_options_handler.cc b/chrome/browser/ui/webui/options/advanced_options_handler.cc
index 96aee00..cc593f7 100644
--- a/chrome/browser/webui/options/advanced_options_handler.cc
+++ b/chrome/browser/ui/webui/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/webui/options/advanced_options_handler.h"
+#include "chrome/browser/ui/webui/options/advanced_options_handler.h"
 
 #include <string>
 
@@ -27,8 +27,8 @@
 #include "chrome/browser/tab_contents/tab_contents_view.h"
 #include "chrome/browser/ui/options/options_util.h"
 #include "chrome/browser/ui/options/options_window.h"
-#include "chrome/browser/webui/options/dom_options_util.h"
-#include "chrome/browser/webui/options/options_managed_banner_handler.h"
+#include "chrome/browser/ui/webui/options/dom_options_util.h"
+#include "chrome/browser/ui/webui/options/options_managed_banner_handler.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/notification_details.h"
 #include "chrome/common/notification_type.h"
@@ -41,7 +41,7 @@
 
 #if !defined(OS_CHROMEOS)
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/webui/options/advanced_options_utils.h"
+#include "chrome/browser/ui/webui/options/advanced_options_utils.h"
 #endif
 
 #if defined(OS_WIN)
diff --git a/chrome/browser/webui/options/advanced_options_handler.h b/chrome/browser/ui/webui/options/advanced_options_handler.h
index 554ac90..d177c50 100644
--- a/chrome/browser/webui/options/advanced_options_handler.h
+++ b/chrome/browser/ui/webui/options/advanced_options_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_WEBUI_OPTIONS_ADVANCED_OPTIONS_HANDLER_H_
-#define CHROME_BROWSER_WEBUI_OPTIONS_ADVANCED_OPTIONS_HANDLER_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_ADVANCED_OPTIONS_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS_ADVANCED_OPTIONS_HANDLER_H_
 #pragma once
 
 #include "chrome/browser/prefs/pref_member.h"
@@ -11,7 +11,7 @@
 #include "chrome/browser/printing/cloud_print/cloud_print_setup_flow.h"
 #include "chrome/browser/remoting/remoting_options_handler.h"
 #include "chrome/browser/ui/shell_dialogs.h"
-#include "chrome/browser/webui/options/options_ui.h"
+#include "chrome/browser/ui/webui/options/options_ui.h"
 
 class OptionsManagedBannerHandler;
 
@@ -180,4 +180,4 @@ class AdvancedOptionsHandler
   DISALLOW_COPY_AND_ASSIGN(AdvancedOptionsHandler);
 };
 
-#endif  // CHROME_BROWSER_WEBUI_OPTIONS_ADVANCED_OPTIONS_HANDLER_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS_ADVANCED_OPTIONS_HANDLER_H_
diff --git a/chrome/browser/webui/options/advanced_options_utils.h b/chrome/browser/ui/webui/options/advanced_options_utils.h
index 312a718..1bb8e7c 100644
--- a/chrome/browser/webui/options/advanced_options_utils.h
+++ b/chrome/browser/ui/webui/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_WEBUI_OPTIONS_ADVANCED_OPTIONS_UTILS_H_
-#define CHROME_BROWSER_WEBUI_OPTIONS_ADVANCED_OPTIONS_UTILS_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_ADVANCED_OPTIONS_UTILS_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS_ADVANCED_OPTIONS_UTILS_H_
 
 #include "base/basictypes.h"
 
@@ -22,4 +22,4 @@ class AdvancedOptionsUtilities {
   DISALLOW_IMPLICIT_CONSTRUCTORS(AdvancedOptionsUtilities);
 };
 
-#endif  // CHROME_BROWSER_WEBUI_OPTIONS_ADVANCED_OPTIONS_UTILS_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS_ADVANCED_OPTIONS_UTILS_H_
diff --git a/chrome/browser/webui/options/advanced_options_utils_gtk.cc b/chrome/browser/ui/webui/options/advanced_options_utils_gtk.cc
index a5efd25..cf92cdb 100644
--- a/chrome/browser/webui/options/advanced_options_utils_gtk.cc
+++ b/chrome/browser/ui/webui/options/advanced_options_utils_gtk.cc
@@ -4,7 +4,7 @@
 
 #if !defined(OS_CHROMEOS)
 
-#include "chrome/browser/webui/options/advanced_options_utils.h"
+#include "chrome/browser/ui/webui/options/advanced_options_utils.h"
 
 #include "base/environment.h"
 #include "base/file_util.h"
diff --git a/chrome/browser/webui/options/advanced_options_utils_mac.mm b/chrome/browser/ui/webui/options/advanced_options_utils_mac.mm
index 430a491..3fa9c7e 100644
--- a/chrome/browser/webui/options/advanced_options_utils_mac.mm
+++ b/chrome/browser/ui/webui/options/advanced_options_utils_mac.mm
@@ -4,7 +4,7 @@
 
 #import <Cocoa/Cocoa.h>
 
-#include "chrome/browser/webui/options/advanced_options_utils.h"
+#include "chrome/browser/ui/webui/options/advanced_options_utils.h"
 
 #include "base/logging.h"
 #include "base/mac/scoped_aedesc.h"
diff --git a/chrome/browser/webui/options/advanced_options_utils_win.cc b/chrome/browser/ui/webui/options/advanced_options_utils_win.cc
index 196ce35..50c9115 100644
--- a/chrome/browser/webui/options/advanced_options_utils_win.cc
+++ b/chrome/browser/ui/webui/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/webui/options/advanced_options_utils.h"
+#include "chrome/browser/ui/webui/options/advanced_options_utils.h"
 
 #include <windows.h>
 #include <cryptuiapi.h>
diff --git a/chrome/browser/webui/options/autofill_options_handler.cc b/chrome/browser/ui/webui/options/autofill_options_handler.cc
index 9ffec74..1676e90 100644
--- a/chrome/browser/webui/options/autofill_options_handler.cc
+++ b/chrome/browser/ui/webui/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/webui/options/autofill_options_handler.h"
+#include "chrome/browser/ui/webui/options/autofill_options_handler.h"
 
 #include <vector>
 
diff --git a/chrome/browser/webui/options/autofill_options_handler.h b/chrome/browser/ui/webui/options/autofill_options_handler.h
index 5b559ae..69066cc 100644
--- a/chrome/browser/webui/options/autofill_options_handler.h
+++ b/chrome/browser/ui/webui/options/autofill_options_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_WEBUI_OPTIONS_AUTOFILL_OPTIONS_HANDLER_H_
-#define CHROME_BROWSER_WEBUI_OPTIONS_AUTOFILL_OPTIONS_HANDLER_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_AUTOFILL_OPTIONS_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS_AUTOFILL_OPTIONS_HANDLER_H_
 
 #include <string>
 
 #include "chrome/browser/autofill/personal_data_manager.h"
-#include "chrome/browser/webui/options/options_ui.h"
+#include "chrome/browser/ui/webui/options/options_ui.h"
 
 class DictionaryValue;
 class ListValue;
@@ -75,4 +75,4 @@ class AutoFillOptionsHandler : public OptionsPageUIHandler,
   DISALLOW_COPY_AND_ASSIGN(AutoFillOptionsHandler);
 };
 
-#endif  // CHROME_BROWSER_WEBUI_OPTIONS_AUTOFILL_OPTIONS_HANDLER_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS_AUTOFILL_OPTIONS_HANDLER_H_
diff --git a/chrome/browser/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc
index a55d946..19baa57 100644
--- a/chrome/browser/webui/options/browser_options_handler.cc
+++ b/chrome/browser/ui/webui/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/webui/options/browser_options_handler.h"
+#include "chrome/browser/ui/webui/options/browser_options_handler.h"
 
 #include "base/basictypes.h"
 #include "base/scoped_ptr.h"
@@ -22,9 +22,9 @@
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/ui/options/options_window.h"
+#include "chrome/browser/ui/webui/options/dom_options_util.h"
+#include "chrome/browser/ui/webui/options/options_managed_banner_handler.h"
 #include "chrome/browser/webui/favicon_source.h"
-#include "chrome/browser/webui/options/dom_options_util.h"
-#include "chrome/browser/webui/options/options_managed_banner_handler.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "grit/chromium_strings.h"
diff --git a/chrome/browser/webui/options/browser_options_handler.h b/chrome/browser/ui/webui/options/browser_options_handler.h
index 0d2ae95..76ff0c8 100644
--- a/chrome/browser/webui/options/browser_options_handler.h
+++ b/chrome/browser/ui/webui/options/browser_options_handler.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_WEBUI_OPTIONS_BROWSER_OPTIONS_HANDLER_H_
-#define CHROME_BROWSER_WEBUI_OPTIONS_BROWSER_OPTIONS_HANDLER_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_BROWSER_OPTIONS_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS_BROWSER_OPTIONS_HANDLER_H_
 #pragma once
 
 #include "chrome/browser/prefs/pref_member.h"
 #include "chrome/browser/search_engines/template_url_model_observer.h"
 #include "chrome/browser/shell_integration.h"
-#include "chrome/browser/webui/options/options_ui.h"
+#include "chrome/browser/ui/webui/options/options_ui.h"
 #include "ui/base/models/table_model_observer.h"
 
 class CustomHomePagesTableModel;
@@ -108,4 +108,4 @@ class BrowserOptionsHandler : public OptionsPageUIHandler,
   DISALLOW_COPY_AND_ASSIGN(BrowserOptionsHandler);
 };
 
-#endif  // CHROME_BROWSER_WEBUI_OPTIONS_BROWSER_OPTIONS_HANDLER_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS_BROWSER_OPTIONS_HANDLER_H_
diff --git a/chrome/browser/webui/options/certificate_manager_handler.cc b/chrome/browser/ui/webui/options/certificate_manager_handler.cc
index bdbbfc9..097e691 100644
--- a/chrome/browser/webui/options/certificate_manager_handler.cc
+++ b/chrome/browser/ui/webui/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/webui/options/certificate_manager_handler.h"
+#include "chrome/browser/ui/webui/options/certificate_manager_handler.h"
 
 #include "base/file_util.h"  // for FileAccessProvider
 #include "base/safe_strerror_posix.h"
diff --git a/chrome/browser/webui/options/certificate_manager_handler.h b/chrome/browser/ui/webui/options/certificate_manager_handler.h
index 031c86c..4ead5be 100644
--- a/chrome/browser/webui/options/certificate_manager_handler.h
+++ b/chrome/browser/ui/webui/options/certificate_manager_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_WEBUI_OPTIONS_CERTIFICATE_MANAGER_HANDLER_H_
-#define CHROME_BROWSER_WEBUI_OPTIONS_CERTIFICATE_MANAGER_HANDLER_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_CERTIFICATE_MANAGER_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS_CERTIFICATE_MANAGER_HANDLER_H_
 #pragma once
 
 #include <string>
@@ -12,7 +12,7 @@
 #include "chrome/browser/cancelable_request.h"
 #include "chrome/browser/certificate_manager_model.h"
 #include "chrome/browser/ui/shell_dialogs.h"
-#include "chrome/browser/webui/options/options_ui.h"
+#include "chrome/browser/ui/webui/options/options_ui.h"
 #include "net/base/cert_database.h"
 #include "ui/gfx/native_widget_types.h"
 
@@ -158,4 +158,4 @@ class CertificateManagerHandler : public OptionsPageUIHandler,
   DISALLOW_COPY_AND_ASSIGN(CertificateManagerHandler);
 };
 
-#endif  // CHROME_BROWSER_WEBUI_OPTIONS_CERTIFICATE_MANAGER_HANDLER_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS_CERTIFICATE_MANAGER_HANDLER_H_
diff --git a/chrome/browser/webui/options/clear_browser_data_handler.cc b/chrome/browser/ui/webui/options/clear_browser_data_handler.cc
index 2823c2e..658c5ea 100644
--- a/chrome/browser/webui/options/clear_browser_data_handler.cc
+++ b/chrome/browser/ui/webui/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/webui/options/clear_browser_data_handler.h"
+#include "chrome/browser/ui/webui/options/clear_browser_data_handler.h"
 
 #include "base/basictypes.h"
 #include "base/string16.h"
diff --git a/chrome/browser/webui/options/clear_browser_data_handler.h b/chrome/browser/ui/webui/options/clear_browser_data_handler.h
index b76dd7f..63e176c 100644
--- a/chrome/browser/webui/options/clear_browser_data_handler.h
+++ b/chrome/browser/ui/webui/options/clear_browser_data_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_WEBUI_OPTIONS_CLEAR_BROWSER_DATA_HANDLER_H_
-#define CHROME_BROWSER_WEBUI_OPTIONS_CLEAR_BROWSER_DATA_HANDLER_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_CLEAR_BROWSER_DATA_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS_CLEAR_BROWSER_DATA_HANDLER_H_
 #pragma once
 
 #include "chrome/browser/browsing_data_remover.h"
 #include "chrome/browser/plugin_data_remover_helper.h"
-#include "chrome/browser/webui/options/options_ui.h"
+#include "chrome/browser/ui/webui/options/options_ui.h"
 
 // Clear browser data handler page UI handler.
 class ClearBrowserDataHandler : public OptionsPageUIHandler,
@@ -51,4 +51,4 @@ class ClearBrowserDataHandler : public OptionsPageUIHandler,
   DISALLOW_COPY_AND_ASSIGN(ClearBrowserDataHandler);
 };
 
-#endif  // CHROME_BROWSER_WEBUI_OPTIONS_CLEAR_BROWSER_DATA_HANDLER_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS_CLEAR_BROWSER_DATA_HANDLER_H_
diff --git a/chrome/browser/webui/options/content_settings_handler.cc b/chrome/browser/ui/webui/options/content_settings_handler.cc
index a3f2418..4717534 100644
--- a/chrome/browser/webui/options/content_settings_handler.cc
+++ b/chrome/browser/ui/webui/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/webui/options/content_settings_handler.h"
+#include "chrome/browser/ui/webui/options/content_settings_handler.h"
 
 #include "base/callback.h"
 #include "base/command_line.h"
diff --git a/chrome/browser/webui/options/content_settings_handler.h b/chrome/browser/ui/webui/options/content_settings_handler.h
index 7e5d72d..5b9cf53 100644
--- a/chrome/browser/webui/options/content_settings_handler.h
+++ b/chrome/browser/ui/webui/options/content_settings_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_WEBUI_OPTIONS_CONTENT_SETTINGS_HANDLER_H_
-#define CHROME_BROWSER_WEBUI_OPTIONS_CONTENT_SETTINGS_HANDLER_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_CONTENT_SETTINGS_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS_CONTENT_SETTINGS_HANDLER_H_
 #pragma once
 
 #include "chrome/browser/plugin_data_remover_helper.h"
 #include "chrome/browser/prefs/pref_change_registrar.h"
-#include "chrome/browser/webui/options/options_ui.h"
+#include "chrome/browser/ui/webui/options/options_ui.h"
 #include "chrome/common/content_settings_types.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
@@ -112,4 +112,4 @@ class ContentSettingsHandler : public OptionsPageUIHandler {
   DISALLOW_COPY_AND_ASSIGN(ContentSettingsHandler);
 };
 
-#endif  // CHROME_BROWSER_WEBUI_OPTIONS_CONTENT_SETTINGS_HANDLER_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS_CONTENT_SETTINGS_HANDLER_H_
diff --git a/chrome/browser/webui/options/cookies_view_handler.cc b/chrome/browser/ui/webui/options/cookies_view_handler.cc
index a18d11b..a292731 100644
--- a/chrome/browser/webui/options/cookies_view_handler.cc
+++ b/chrome/browser/ui/webui/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/webui/options/cookies_view_handler.h"
+#include "chrome/browser/ui/webui/options/cookies_view_handler.h"
 
 #include "base/i18n/time_formatting.h"
 #include "base/string_number_conversions.h"
diff --git a/chrome/browser/webui/options/cookies_view_handler.h b/chrome/browser/ui/webui/options/cookies_view_handler.h
index 7b38ec4..f2f2210 100644
--- a/chrome/browser/webui/options/cookies_view_handler.h
+++ b/chrome/browser/ui/webui/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_WEBUI_OPTIONS_COOKIES_VIEW_HANDLER_H_
-#define CHROME_BROWSER_WEBUI_OPTIONS_COOKIES_VIEW_HANDLER_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_COOKIES_VIEW_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS_COOKIES_VIEW_HANDLER_H_
 #pragma once
 
 #include "base/scoped_ptr.h"
 #include "chrome/browser/cookies_tree_model.h"
-#include "chrome/browser/webui/options/options_ui.h"
+#include "chrome/browser/ui/webui/options/options_ui.h"
 
 class CookiesViewHandler : public OptionsPageUIHandler,
                            public CookiesTreeModel::Observer {
@@ -63,4 +63,4 @@ class CookiesViewHandler : public OptionsPageUIHandler,
   DISALLOW_COPY_AND_ASSIGN(CookiesViewHandler);
 };
 
-#endif  // CHROME_BROWSER_WEBUI_OPTIONS_COOKIES_VIEW_HANDLER_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS_COOKIES_VIEW_HANDLER_H_
diff --git a/chrome/browser/webui/options/core_options_handler.cc b/chrome/browser/ui/webui/options/core_options_handler.cc
index 014be3b..8739756 100644
--- a/chrome/browser/webui/options/core_options_handler.cc
+++ b/chrome/browser/ui/webui/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/webui/options/core_options_handler.h"
+#include "chrome/browser/ui/webui/options/core_options_handler.h"
 
 #include "base/json/json_reader.h"
 #include "base/scoped_ptr.h"
diff --git a/chrome/browser/webui/options/core_options_handler.h b/chrome/browser/ui/webui/options/core_options_handler.h
index 2baecd1..0b9aef0 100644
--- a/chrome/browser/webui/options/core_options_handler.h
+++ b/chrome/browser/ui/webui/options/core_options_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_WEBUI_OPTIONS_CORE_OPTIONS_HANDLER_H_
-#define CHROME_BROWSER_WEBUI_OPTIONS_CORE_OPTIONS_HANDLER_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_CORE_OPTIONS_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS_CORE_OPTIONS_HANDLER_H_
 #pragma once
 
 #include <map>
@@ -11,7 +11,7 @@
 
 #include "base/values.h"
 #include "chrome/browser/prefs/pref_change_registrar.h"
-#include "chrome/browser/webui/options/options_ui.h"
+#include "chrome/browser/ui/webui/options/options_ui.h"
 
 // Core options UI handler.
 // Handles resource and JS calls common to all options sub-pages.
@@ -105,4 +105,4 @@ class CoreOptionsHandler : public OptionsPageUIHandler {
   DISALLOW_COPY_AND_ASSIGN(CoreOptionsHandler);
 };
 
-#endif  // CHROME_BROWSER_WEBUI_OPTIONS_CORE_OPTIONS_HANDLER_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS_CORE_OPTIONS_HANDLER_H_
diff --git a/chrome/browser/webui/options/dom_options_util.cc b/chrome/browser/ui/webui/options/dom_options_util.cc
index 0896c27..91a272d 100644
--- a/chrome/browser/webui/options/dom_options_util.cc
+++ b/chrome/browser/ui/webui/options/dom_options_util.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/webui/options/dom_options_util.h"
+#include "chrome/browser/ui/webui/options/dom_options_util.h"
 
 #include "base/string_util.h"
 
diff --git a/chrome/browser/webui/options/dom_options_util.h b/chrome/browser/ui/webui/options/dom_options_util.h
index 83a7521..9c3b41f 100644
--- a/chrome/browser/webui/options/dom_options_util.h
+++ b/chrome/browser/ui/webui/options/dom_options_util.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_WEBUI_OPTIONS_DOM_OPTIONS_UTIL_H_
-#define CHROME_BROWSER_WEBUI_OPTIONS_DOM_OPTIONS_UTIL_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_DOM_OPTIONS_UTIL_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS_DOM_OPTIONS_UTIL_H_
 #pragma once
 
 #include "base/string16.h"
@@ -18,4 +18,4 @@ string16 StripColon(const string16& str);
 
 }  // namespace options_util
 
-#endif  // CHROME_BROWSER_WEBUI_OPTIONS_DOM_OPTIONS_UTIL_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS_DOM_OPTIONS_UTIL_H_
diff --git a/chrome/browser/webui/options/font_settings_handler.cc b/chrome/browser/ui/webui/options/font_settings_handler.cc
index 42e7204..0988554 100644
--- a/chrome/browser/webui/options/font_settings_handler.cc
+++ b/chrome/browser/ui/webui/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/webui/options/font_settings_handler.h"
+#include "chrome/browser/ui/webui/options/font_settings_handler.h"
 
 #include <string>
 
@@ -13,8 +13,8 @@
 #include "chrome/browser/character_encoding.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/webui/options/dom_options_util.h"
-#include "chrome/browser/webui/options/font_settings_utils.h"
+#include "chrome/browser/ui/webui/options/dom_options_util.h"
+#include "chrome/browser/ui/webui/options/font_settings_utils.h"
 #include "chrome/common/notification_details.h"
 #include "chrome/common/notification_type.h"
 #include "chrome/common/pref_names.h"
diff --git a/chrome/browser/webui/options/font_settings_handler.h b/chrome/browser/ui/webui/options/font_settings_handler.h
index 152df5a..a5d54d4 100644
--- a/chrome/browser/webui/options/font_settings_handler.h
+++ b/chrome/browser/ui/webui/options/font_settings_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_WEBUI_OPTIONS_FONT_SETTINGS_HANDLER_H_
-#define CHROME_BROWSER_WEBUI_OPTIONS_FONT_SETTINGS_HANDLER_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_FONT_SETTINGS_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS_FONT_SETTINGS_HANDLER_H_
 #pragma once
 
 #include "chrome/browser/prefs/pref_member.h"
-#include "chrome/browser/webui/options/options_ui.h"
+#include "chrome/browser/ui/webui/options/options_ui.h"
 
 // Font settings overlay page UI handler.
 class FontSettingsHandler : public OptionsPageUIHandler {
@@ -41,4 +41,4 @@ class FontSettingsHandler : public OptionsPageUIHandler {
   DISALLOW_COPY_AND_ASSIGN(FontSettingsHandler);
 };
 
-#endif  // CHROME_BROWSER_WEBUI_OPTIONS_FONT_SETTINGS_HANDLER_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS_FONT_SETTINGS_HANDLER_H_
diff --git a/chrome/browser/webui/options/font_settings_utils.h b/chrome/browser/ui/webui/options/font_settings_utils.h
index 00cf63f..6a1954e 100644
--- a/chrome/browser/webui/options/font_settings_utils.h
+++ b/chrome/browser/ui/webui/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_WEBUI_OPTIONS_FONT_SETTINGS_UTILS_H_
-#define CHROME_BROWSER_WEBUI_OPTIONS_FONT_SETTINGS_UTILS_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_FONT_SETTINGS_UTILS_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS_FONT_SETTINGS_UTILS_H_
 #pragma once
 
 #include "base/basictypes.h"
@@ -22,4 +22,4 @@ class FontSettingsUtilities {
   DISALLOW_IMPLICIT_CONSTRUCTORS(FontSettingsUtilities);
 };
 
-#endif  // CHROME_BROWSER_WEBUI_OPTIONS_FONT_SETTINGS_UTILS_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS_FONT_SETTINGS_UTILS_H_
diff --git a/chrome/browser/webui/options/font_settings_utils_gtk.cc b/chrome/browser/ui/webui/options/font_settings_utils_gtk.cc
index 4f60f95..b44f26c 100644
--- a/chrome/browser/webui/options/font_settings_utils_gtk.cc
+++ b/chrome/browser/ui/webui/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/webui/options/font_settings_utils.h"
+#include "chrome/browser/ui/webui/options/font_settings_utils.h"
 
 #include <set>
 #include <string>
diff --git a/chrome/browser/webui/options/font_settings_utils_mac.mm b/chrome/browser/ui/webui/options/font_settings_utils_mac.mm
index acf2427..2a29ffa 100644
--- a/chrome/browser/webui/options/font_settings_utils_mac.mm
+++ b/chrome/browser/ui/webui/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/webui/options/font_settings_utils.h"
+#include "chrome/browser/ui/webui/options/font_settings_utils.h"
 
 #import <Cocoa/Cocoa.h>
 
diff --git a/chrome/browser/webui/options/font_settings_utils_win.cc b/chrome/browser/ui/webui/options/font_settings_utils_win.cc
index 0b9644f..694fc5e 100644
--- a/chrome/browser/webui/options/font_settings_utils_win.cc
+++ b/chrome/browser/ui/webui/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/webui/options/font_settings_utils.h"
+#include "chrome/browser/ui/webui/options/font_settings_utils.h"
 
 #include <set>
 #include <string>
diff --git a/chrome/browser/webui/options/import_data_handler.cc b/chrome/browser/ui/webui/options/import_data_handler.cc
index 36f201f..8f914e9 100644
--- a/chrome/browser/webui/options/import_data_handler.cc
+++ b/chrome/browser/ui/webui/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/webui/options/import_data_handler.h"
+#include "chrome/browser/ui/webui/options/import_data_handler.h"
 
 #include <string>
 
diff --git a/chrome/browser/webui/options/import_data_handler.h b/chrome/browser/ui/webui/options/import_data_handler.h
index 8cd75e2..63802e7 100644
--- a/chrome/browser/webui/options/import_data_handler.h
+++ b/chrome/browser/ui/webui/options/import_data_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_WEBUI_OPTIONS_IMPORT_DATA_HANDLER_H_
-#define CHROME_BROWSER_WEBUI_OPTIONS_IMPORT_DATA_HANDLER_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_IMPORT_DATA_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS_IMPORT_DATA_HANDLER_H_
 
 #include "base/ref_counted.h"
 #include "chrome/browser/importer/importer.h"
-#include "chrome/browser/webui/options/options_ui.h"
+#include "chrome/browser/ui/webui/options/options_ui.h"
 
 // Chrome personal stuff import data overlay UI handler.
 class ImportDataHandler : public OptionsPageUIHandler,
@@ -45,4 +45,4 @@ class ImportDataHandler : public OptionsPageUIHandler,
   DISALLOW_COPY_AND_ASSIGN(ImportDataHandler);
 };
 
-#endif  // CHROME_BROWSER_WEBUI_OPTIONS_IMPORT_DATA_HANDLER_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS_IMPORT_DATA_HANDLER_H_
diff --git a/chrome/browser/webui/options/language_options_handler.cc b/chrome/browser/ui/webui/options/language_options_handler.cc
index 746ffff..9776473 100644
--- a/chrome/browser/webui/options/language_options_handler.cc
+++ b/chrome/browser/ui/webui/options/language_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/webui/options/language_options_handler.h"
+#include "chrome/browser/ui/webui/options/language_options_handler.h"
 
 #include <map>
 #include <string>
diff --git a/chrome/browser/webui/options/language_options_handler.h b/chrome/browser/ui/webui/options/language_options_handler.h
index 49ad655..0be6b32 100644
--- a/chrome/browser/webui/options/language_options_handler.h
+++ b/chrome/browser/ui/webui/options/language_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_WEBUI_OPTIONS_LANGUAGE_OPTIONS_HANDLER_H_
-#define CHROME_BROWSER_WEBUI_OPTIONS_LANGUAGE_OPTIONS_HANDLER_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_LANGUAGE_OPTIONS_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS_LANGUAGE_OPTIONS_HANDLER_H_
 #pragma once
 
-#include "chrome/browser/webui/options/language_options_handler_common.h"
+#include "chrome/browser/ui/webui/options/language_options_handler_common.h"
 
 // Language options UI page handler for non-Chrome OS platforms.  For Chrome OS,
 // see chromeos::CrosLanguageOptionsHandler.
@@ -40,4 +40,4 @@ class LanguageOptionsHandler : public LanguageOptionsHandlerCommon {
   DISALLOW_COPY_AND_ASSIGN(LanguageOptionsHandler);
 };
 
-#endif  // CHROME_BROWSER_WEBUI_OPTIONS_LANGUAGE_OPTIONS_HANDLER_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS_LANGUAGE_OPTIONS_HANDLER_H_
diff --git a/chrome/browser/webui/options/language_options_handler_common.cc b/chrome/browser/ui/webui/options/language_options_handler_common.cc
index 498816f..79fb1f9 100644
--- a/chrome/browser/webui/options/language_options_handler_common.cc
+++ b/chrome/browser/ui/webui/options/language_options_handler_common.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/webui/options/language_options_handler_common.h"
+#include "chrome/browser/ui/webui/options/language_options_handler_common.h"
 
 #include <map>
 #include <string>
diff --git a/chrome/browser/webui/options/language_options_handler_common.h b/chrome/browser/ui/webui/options/language_options_handler_common.h
index 369be14..6b0e2f8 100644
--- a/chrome/browser/webui/options/language_options_handler_common.h
+++ b/chrome/browser/ui/webui/options/language_options_handler_common.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_WEBUI_OPTIONS_LANGUAGE_OPTIONS_HANDLER_COMMON_H_
-#define CHROME_BROWSER_WEBUI_OPTIONS_LANGUAGE_OPTIONS_HANDLER_COMMON_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_LANGUAGE_OPTIONS_HANDLER_COMMON_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS_LANGUAGE_OPTIONS_HANDLER_COMMON_H_
 #pragma once
 
-#include "chrome/browser/webui/options/options_ui.h"
+#include "chrome/browser/ui/webui/options/options_ui.h"
 
 class DictionaryValue;
 class ListValue;
@@ -63,4 +63,4 @@ class LanguageOptionsHandlerCommon : public OptionsPageUIHandler {
   DISALLOW_COPY_AND_ASSIGN(LanguageOptionsHandlerCommon);
 };
 
-#endif  // CHROME_BROWSER_WEBUI_OPTIONS_LANGUAGE_OPTIONS_HANDLER_COMMON_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS_LANGUAGE_OPTIONS_HANDLER_COMMON_H_
diff --git a/chrome/browser/webui/options/language_options_handler_unittest.cc b/chrome/browser/ui/webui/options/language_options_handler_unittest.cc
index 0308682..c3415d1 100644
--- a/chrome/browser/webui/options/language_options_handler_unittest.cc
+++ b/chrome/browser/ui/webui/options/language_options_handler_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/webui/options/language_options_handler.h"
+#include "chrome/browser/ui/webui/options/language_options_handler.h"
 
 #include <string>
 
diff --git a/chrome/browser/webui/options/options_managed_banner_handler.cc b/chrome/browser/ui/webui/options/options_managed_banner_handler.cc
index 43f59d0..144ddff 100644
--- a/chrome/browser/webui/options/options_managed_banner_handler.cc
+++ b/chrome/browser/ui/webui/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/webui/options/options_managed_banner_handler.h"
+#include "chrome/browser/ui/webui/options/options_managed_banner_handler.h"
 
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
diff --git a/chrome/browser/webui/options/options_managed_banner_handler.h b/chrome/browser/ui/webui/options/options_managed_banner_handler.h
index 5695e93..288aac8 100644
--- a/chrome/browser/webui/options/options_managed_banner_handler.h
+++ b/chrome/browser/ui/webui/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_WEBUI_OPTIONS_OPTIONS_MANAGED_BANNER_HANDLER_H_
-#define CHROME_BROWSER_WEBUI_OPTIONS_OPTIONS_MANAGED_BANNER_HANDLER_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_OPTIONS_MANAGED_BANNER_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS_OPTIONS_MANAGED_BANNER_HANDLER_H_
 #pragma once
 
 #include "base/string16.h"
@@ -36,4 +36,4 @@ class OptionsManagedBannerHandler : public policy::ManagedPrefsBannerBase {
   DISALLOW_COPY_AND_ASSIGN(OptionsManagedBannerHandler);
 };
 
-#endif  // CHROME_BROWSER_WEBUI_OPTIONS_OPTIONS_MANAGED_BANNER_HANDLER_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS_OPTIONS_MANAGED_BANNER_HANDLER_H_
diff --git a/chrome/browser/webui/options/options_ui.cc b/chrome/browser/ui/webui/options/options_ui.cc
index aec93be..e2b6c05 100644
--- a/chrome/browser/webui/options/options_ui.cc
+++ b/chrome/browser/ui/webui/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/webui/options/options_ui.h"
+#include "chrome/browser/ui/webui/options/options_ui.h"
 
 #include <algorithm>
 #include <vector>
@@ -23,23 +23,23 @@
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_delegate.h"
-#include "chrome/browser/webui/options/about_page_handler.h"
-#include "chrome/browser/webui/options/add_startup_page_handler.h"
-#include "chrome/browser/webui/options/advanced_options_handler.h"
-#include "chrome/browser/webui/options/autofill_options_handler.h"
-#include "chrome/browser/webui/options/browser_options_handler.h"
-#include "chrome/browser/webui/options/clear_browser_data_handler.h"
-#include "chrome/browser/webui/options/content_settings_handler.h"
-#include "chrome/browser/webui/options/cookies_view_handler.h"
-#include "chrome/browser/webui/options/core_options_handler.h"
-#include "chrome/browser/webui/options/dom_options_util.h"
-#include "chrome/browser/webui/options/font_settings_handler.h"
-#include "chrome/browser/webui/options/import_data_handler.h"
-#include "chrome/browser/webui/options/language_options_handler.h"
-#include "chrome/browser/webui/options/password_manager_handler.h"
-#include "chrome/browser/webui/options/personal_options_handler.h"
-#include "chrome/browser/webui/options/search_engine_manager_handler.h"
-#include "chrome/browser/webui/options/stop_syncing_handler.h"
+#include "chrome/browser/ui/webui/options/about_page_handler.h"
+#include "chrome/browser/ui/webui/options/add_startup_page_handler.h"
+#include "chrome/browser/ui/webui/options/advanced_options_handler.h"
+#include "chrome/browser/ui/webui/options/autofill_options_handler.h"
+#include "chrome/browser/ui/webui/options/browser_options_handler.h"
+#include "chrome/browser/ui/webui/options/clear_browser_data_handler.h"
+#include "chrome/browser/ui/webui/options/content_settings_handler.h"
+#include "chrome/browser/ui/webui/options/cookies_view_handler.h"
+#include "chrome/browser/ui/webui/options/core_options_handler.h"
+#include "chrome/browser/ui/webui/options/dom_options_util.h"
+#include "chrome/browser/ui/webui/options/font_settings_handler.h"
+#include "chrome/browser/ui/webui/options/import_data_handler.h"
+#include "chrome/browser/ui/webui/options/language_options_handler.h"
+#include "chrome/browser/ui/webui/options/password_manager_handler.h"
+#include "chrome/browser/ui/webui/options/personal_options_handler.h"
+#include "chrome/browser/ui/webui/options/search_engine_manager_handler.h"
+#include "chrome/browser/ui/webui/options/stop_syncing_handler.h"
 #include "chrome/browser/webui/theme_source.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/notification_type.h"
@@ -70,7 +70,7 @@
 #endif
 
 #if defined(USE_NSS)
-#include "chrome/browser/webui/options/certificate_manager_handler.h"
+#include "chrome/browser/ui/webui/options/certificate_manager_handler.h"
 #endif
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/chrome/browser/webui/options/options_ui.h b/chrome/browser/ui/webui/options/options_ui.h
index 7f04c55..f912b6c 100644
--- a/chrome/browser/webui/options/options_ui.h
+++ b/chrome/browser/ui/webui/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_WEBUI_OPTIONS_OPTIONS_UI_H_
-#define CHROME_BROWSER_WEBUI_OPTIONS_OPTIONS_UI_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_OPTIONS_UI_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS_OPTIONS_UI_H_
 #pragma once
 
 #include <string>
@@ -116,4 +116,4 @@ class OptionsUI : public WebUI {
   DISALLOW_COPY_AND_ASSIGN(OptionsUI);
 };
 
-#endif  // CHROME_BROWSER_WEBUI_OPTIONS_OPTIONS_UI_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS_OPTIONS_UI_H_
diff --git a/chrome/browser/webui/options/options_ui_uitest.cc b/chrome/browser/ui/webui/options/options_ui_uitest.cc
index d6061aa..d6061aa 100644
--- a/chrome/browser/webui/options/options_ui_uitest.cc
+++ b/chrome/browser/ui/webui/options/options_ui_uitest.cc
diff --git a/chrome/browser/webui/options/password_manager_handler.cc b/chrome/browser/ui/webui/options/password_manager_handler.cc
index e3cc3f9..70ffeff 100644
--- a/chrome/browser/webui/options/password_manager_handler.cc
+++ b/chrome/browser/ui/webui/options/password_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/webui/options/password_manager_handler.h"
+#include "chrome/browser/ui/webui/options/password_manager_handler.h"
 
 #include "base/callback.h"
 #include "base/stl_util-inl.h"
diff --git a/chrome/browser/webui/options/password_manager_handler.h b/chrome/browser/ui/webui/options/password_manager_handler.h
index 5f423e8..1a319e7 100644
--- a/chrome/browser/webui/options/password_manager_handler.h
+++ b/chrome/browser/ui/webui/options/password_manager_handler.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_WEBUI_OPTIONS_PASSWORD_MANAGER_HANDLER_H_
-#define CHROME_BROWSER_WEBUI_OPTIONS_PASSWORD_MANAGER_HANDLER_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_PASSWORD_MANAGER_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS_PASSWORD_MANAGER_HANDLER_H_
 
 #include <string>
 #include <vector>
 
 #include "chrome/browser/password_manager/password_store.h"
-#include "chrome/browser/webui/options/options_ui.h"
+#include "chrome/browser/ui/webui/options/options_ui.h"
 
 class PasswordManagerHandler : public OptionsPageUIHandler {
  public:
@@ -110,4 +110,4 @@ class PasswordManagerHandler : public OptionsPageUIHandler {
   DISALLOW_COPY_AND_ASSIGN(PasswordManagerHandler);
 };
 
-#endif  // CHROME_BROWSER_WEBUI_OPTIONS_PASSWORD_MANAGER_HANDLER_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS_PASSWORD_MANAGER_HANDLER_H_
diff --git a/chrome/browser/webui/options/personal_options_handler.cc b/chrome/browser/ui/webui/options/personal_options_handler.cc
index e78b1b3..06f37f2 100644
--- a/chrome/browser/webui/options/personal_options_handler.cc
+++ b/chrome/browser/ui/webui/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/webui/options/personal_options_handler.h"
+#include "chrome/browser/ui/webui/options/personal_options_handler.h"
 
 #include <string>
 
@@ -22,8 +22,8 @@
 #include "chrome/browser/themes/browser_theme_provider.h"
 #include "chrome/browser/ui/options/options_page_base.h"
 #include "chrome/browser/ui/options/options_window.h"
-#include "chrome/browser/webui/options/dom_options_util.h"
-#include "chrome/browser/webui/options/options_managed_banner_handler.h"
+#include "chrome/browser/ui/webui/options/dom_options_util.h"
+#include "chrome/browser/ui/webui/options/options_managed_banner_handler.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/net/gaia/google_service_auth_error.h"
 #include "chrome/common/notification_service.h"
diff --git a/chrome/browser/webui/options/personal_options_handler.h b/chrome/browser/ui/webui/options/personal_options_handler.h
index 992c6d8..0d21bd5 100644
--- a/chrome/browser/webui/options/personal_options_handler.h
+++ b/chrome/browser/ui/webui/options/personal_options_handler.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_WEBUI_OPTIONS_PERSONAL_OPTIONS_HANDLER_H_
-#define CHROME_BROWSER_WEBUI_OPTIONS_PERSONAL_OPTIONS_HANDLER_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_PERSONAL_OPTIONS_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS_PERSONAL_OPTIONS_HANDLER_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "chrome/browser/browser_signin.h"
 #include "chrome/browser/sync/profile_sync_service.h"
-#include "chrome/browser/webui/options/options_ui.h"
+#include "chrome/browser/ui/webui/options/options_ui.h"
 
 class OptionsManagedBannerHandler;
 
@@ -63,4 +63,4 @@ class PersonalOptionsHandler : public OptionsPageUIHandler,
   DISALLOW_COPY_AND_ASSIGN(PersonalOptionsHandler);
 };
 
-#endif  // CHROME_BROWSER_WEBUI_OPTIONS_PERSONAL_OPTIONS_HANDLER_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS_PERSONAL_OPTIONS_HANDLER_H_
diff --git a/chrome/browser/webui/options/search_engine_manager_handler.cc b/chrome/browser/ui/webui/options/search_engine_manager_handler.cc
index 53c8d04..6d63de6 100644
--- a/chrome/browser/webui/options/search_engine_manager_handler.cc
+++ b/chrome/browser/ui/webui/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/webui/options/search_engine_manager_handler.h"
+#include "chrome/browser/ui/webui/options/search_engine_manager_handler.h"
 
 #include "base/callback.h"
 #include "base/string_number_conversions.h"
diff --git a/chrome/browser/webui/options/search_engine_manager_handler.h b/chrome/browser/ui/webui/options/search_engine_manager_handler.h
index 5a3fbac..285d3c3 100644
--- a/chrome/browser/webui/options/search_engine_manager_handler.h
+++ b/chrome/browser/ui/webui/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_WEBUI_OPTIONS_SEARCH_ENGINE_MANAGER_HANDLER_H_
-#define CHROME_BROWSER_WEBUI_OPTIONS_SEARCH_ENGINE_MANAGER_HANDLER_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_SEARCH_ENGINE_MANAGER_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS_SEARCH_ENGINE_MANAGER_HANDLER_H_
 
 #include "chrome/browser/ui/search_engines/edit_search_engine_controller.h"
-#include "chrome/browser/webui/options/options_ui.h"
+#include "chrome/browser/ui/webui/options/options_ui.h"
 #include "ui/base/models/table_model_observer.h"
 
 class KeywordEditorController;
@@ -70,4 +70,4 @@ class SearchEngineManagerHandler : public OptionsPageUIHandler,
   DISALLOW_COPY_AND_ASSIGN(SearchEngineManagerHandler);
 };
 
-#endif  // CHROME_BROWSER_WEBUI_OPTIONS_SEARCH_ENGINE_MANAGER_HANDLER_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS_SEARCH_ENGINE_MANAGER_HANDLER_H_
diff --git a/chrome/browser/webui/options/stop_syncing_handler.cc b/chrome/browser/ui/webui/options/stop_syncing_handler.cc
index 80e7e25..a04b2eb 100644
--- a/chrome/browser/webui/options/stop_syncing_handler.cc
+++ b/chrome/browser/ui/webui/options/stop_syncing_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/webui/options/stop_syncing_handler.h"
+#include "chrome/browser/ui/webui/options/stop_syncing_handler.h"
 
 #include "base/basictypes.h"
 #include "base/callback.h"
diff --git a/chrome/browser/webui/options/stop_syncing_handler.h b/chrome/browser/ui/webui/options/stop_syncing_handler.h
index 8da6c2e..095f76c 100644
--- a/chrome/browser/webui/options/stop_syncing_handler.h
+++ b/chrome/browser/ui/webui/options/stop_syncing_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_WEBUI_OPTIONS_STOP_SYNCING_HANDLER_H_
-#define CHROME_BROWSER_WEBUI_OPTIONS_STOP_SYNCING_HANDLER_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_STOP_SYNCING_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS_STOP_SYNCING_HANDLER_H_
 
-#include "chrome/browser/webui/options/options_ui.h"
+#include "chrome/browser/ui/webui/options/options_ui.h"
 
 // Chrome personal stuff stop syncing overlay UI handler.
 class StopSyncingHandler : public OptionsPageUIHandler {
@@ -25,4 +25,4 @@ class StopSyncingHandler : public OptionsPageUIHandler {
   DISALLOW_COPY_AND_ASSIGN(StopSyncingHandler);
 };
 
-#endif  // CHROME_BROWSER_WEBUI_OPTIONS_STOP_SYNCING_HANDLER_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS_STOP_SYNCING_HANDLER_H_
diff --git a/chrome/browser/webui/settings_browsertest.cc b/chrome/browser/webui/settings_browsertest.cc
index c92d7f2..06019b3 100644
--- a/chrome/browser/webui/settings_browsertest.cc
+++ b/chrome/browser/webui/settings_browsertest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/webui/options/core_options_handler.h"
+#include "chrome/browser/ui/webui/options/core_options_handler.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/ui_test_utils.h"
 #include "content/browser/webui/web_ui_browsertest.h"
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 6204ce8..1e30aec 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -3256,6 +3256,56 @@
         'browser/ui/views/window.h',
         'browser/ui/views/wrench_menu.cc',
         'browser/ui/views/wrench_menu.h',
+        'browser/ui/webui/options/about_page_handler.cc',
+        'browser/ui/webui/options/about_page_handler.h',
+        'browser/ui/webui/options/add_startup_page_handler.cc',
+        'browser/ui/webui/options/add_startup_page_handler.h',
+        'browser/ui/webui/options/advanced_options_handler.cc',
+        'browser/ui/webui/options/advanced_options_handler.h',
+        'browser/ui/webui/options/advanced_options_utils.h',
+        'browser/ui/webui/options/advanced_options_utils_gtk.cc',
+        'browser/ui/webui/options/advanced_options_utils_mac.mm',
+        'browser/ui/webui/options/advanced_options_utils_win.cc',
+        'browser/ui/webui/options/autofill_options_handler.cc',
+        'browser/ui/webui/options/autofill_options_handler.h',
+        'browser/ui/webui/options/browser_options_handler.cc',
+        'browser/ui/webui/options/browser_options_handler.h',
+        'browser/ui/webui/options/certificate_manager_handler.cc',
+        'browser/ui/webui/options/certificate_manager_handler.h',
+        'browser/ui/webui/options/clear_browser_data_handler.cc',
+        'browser/ui/webui/options/clear_browser_data_handler.h',
+        'browser/ui/webui/options/content_settings_handler.cc',
+        'browser/ui/webui/options/content_settings_handler.h',
+        'browser/ui/webui/options/cookies_view_handler.cc',
+        'browser/ui/webui/options/cookies_view_handler.h',
+        'browser/ui/webui/options/core_options_handler.cc',
+        'browser/ui/webui/options/core_options_handler.h',
+        'browser/ui/webui/options/dom_options_util.cc',
+        'browser/ui/webui/options/dom_options_util.h',
+        'browser/ui/webui/options/font_settings_handler.cc',
+        'browser/ui/webui/options/font_settings_handler.h',
+        'browser/ui/webui/options/font_settings_utils.h',
+        'browser/ui/webui/options/font_settings_utils_gtk.cc',
+        'browser/ui/webui/options/font_settings_utils_mac.mm',
+        'browser/ui/webui/options/font_settings_utils_win.cc',
+        'browser/ui/webui/options/import_data_handler.cc',
+        'browser/ui/webui/options/import_data_handler.h',
+        'browser/ui/webui/options/language_options_handler.cc',
+        'browser/ui/webui/options/language_options_handler.h',
+        'browser/ui/webui/options/language_options_handler_common.cc',
+        'browser/ui/webui/options/language_options_handler_common.h',
+        'browser/ui/webui/options/options_managed_banner_handler.cc',
+        'browser/ui/webui/options/options_managed_banner_handler.h',
+        'browser/ui/webui/options/options_ui.cc',
+        'browser/ui/webui/options/options_ui.h',
+        'browser/ui/webui/options/password_manager_handler.cc',
+        'browser/ui/webui/options/password_manager_handler.h',
+        'browser/ui/webui/options/personal_options_handler.cc',
+        'browser/ui/webui/options/personal_options_handler.h',
+        'browser/ui/webui/options/search_engine_manager_handler.cc',
+        'browser/ui/webui/options/search_engine_manager_handler.h',
+        'browser/ui/webui/options/stop_syncing_handler.cc',
+        'browser/ui/webui/options/stop_syncing_handler.h',
         'browser/ui/window_sizer.cc',
         'browser/ui/window_sizer.h',
         'browser/ui/window_sizer_linux.cc',
@@ -3351,56 +3401,6 @@
         'browser/webui/ntp_login_handler.h',
         'browser/webui/ntp_resource_cache.cc',
         'browser/webui/ntp_resource_cache.h',
-        'browser/webui/options/about_page_handler.cc',
-        'browser/webui/options/about_page_handler.h',
-        'browser/webui/options/add_startup_page_handler.cc',
-        'browser/webui/options/add_startup_page_handler.h',
-        'browser/webui/options/advanced_options_handler.cc',
-        'browser/webui/options/advanced_options_handler.h',
-        'browser/webui/options/advanced_options_utils.h',
-        'browser/webui/options/advanced_options_utils_gtk.cc',
-        'browser/webui/options/advanced_options_utils_mac.mm',
-        'browser/webui/options/advanced_options_utils_win.cc',
-        'browser/webui/options/autofill_options_handler.cc',
-        'browser/webui/options/autofill_options_handler.h',
-        'browser/webui/options/browser_options_handler.cc',
-        'browser/webui/options/browser_options_handler.h',
-        'browser/webui/options/certificate_manager_handler.cc',
-        'browser/webui/options/certificate_manager_handler.h',
-        'browser/webui/options/clear_browser_data_handler.cc',
-        'browser/webui/options/clear_browser_data_handler.h',
-        'browser/webui/options/content_settings_handler.cc',
-        'browser/webui/options/content_settings_handler.h',
-        'browser/webui/options/cookies_view_handler.cc',
-        'browser/webui/options/cookies_view_handler.h',
-        'browser/webui/options/core_options_handler.cc',
-        'browser/webui/options/core_options_handler.h',
-        'browser/webui/options/dom_options_util.cc',
-        'browser/webui/options/dom_options_util.h',
-        'browser/webui/options/font_settings_handler.cc',
-        'browser/webui/options/font_settings_handler.h',
-        'browser/webui/options/font_settings_utils.h',
-        'browser/webui/options/font_settings_utils_gtk.cc',
-        'browser/webui/options/font_settings_utils_mac.mm',
-        'browser/webui/options/font_settings_utils_win.cc',
-        'browser/webui/options/import_data_handler.cc',
-        'browser/webui/options/import_data_handler.h',
-        'browser/webui/options/language_options_handler.cc',
-        'browser/webui/options/language_options_handler.h',
-        'browser/webui/options/language_options_handler_common.cc',
-        'browser/webui/options/language_options_handler_common.h',
-        'browser/webui/options/options_managed_banner_handler.cc',
-        'browser/webui/options/options_managed_banner_handler.h',
-        'browser/webui/options/options_ui.cc',
-        'browser/webui/options/options_ui.h',
-        'browser/webui/options/password_manager_handler.cc',
-        'browser/webui/options/password_manager_handler.h',
-        'browser/webui/options/personal_options_handler.cc',
-        'browser/webui/options/personal_options_handler.h',
-        'browser/webui/options/search_engine_manager_handler.cc',
-        'browser/webui/options/search_engine_manager_handler.h',
-        'browser/webui/options/stop_syncing_handler.cc',
-        'browser/webui/options/stop_syncing_handler.h',
         'browser/webui/plugins_ui.cc',
         'browser/webui/plugins_ui.h',
         'browser/webui/print_preview_handler.cc',
@@ -3591,8 +3591,8 @@
         }, {  # OS != "linux"
           'sources!': [
             'browser/file_path_watcher/file_path_watcher_inotify.cc',
-            'browser/webui/options/certificate_manager_handler.cc',
-            'browser/webui/options/certificate_manager_handler.h',
+            'browser/ui/webui/options/certificate_manager_handler.cc',
+            'browser/ui/webui/options/certificate_manager_handler.h',
           ],
         }],
         ['OS=="freebsd" or OS=="openbsd"', {
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 4dda5f4..3d10188 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -573,9 +573,9 @@
         'browser/ui/login/login_prompt_uitest.cc',
         'browser/ui/tests/browser_uitest.cc',
         'browser/ui/views/find_bar_host_uitest.cc',
+        'browser/ui/webui/options/options_ui_uitest.cc',
         'browser/webui/bookmarks_ui_uitest.cc',
         'browser/webui/new_tab_ui_uitest.cc',
-        'browser/webui/options/options_ui_uitest.cc',
         'browser/webui/print_preview_ui_uitest.cc',
         'common/logging_chrome_uitest.cc',
         'renderer/external_extension_uitest.cc',
@@ -1725,6 +1725,7 @@
         'browser/ui/views/reload_button_unittest.cc',
         'browser/ui/views/shell_dialogs_win_unittest.cc',
         'browser/ui/views/status_icons/status_tray_win_unittest.cc',
+        'browser/ui/webui/options/language_options_handler_unittest.cc',
         'browser/ui/window_sizer_unittest.cc',
         'browser/ui/window_snapshot/window_snapshot_mac_unittest.mm',
         'browser/user_style_sheet_watcher_unittest.cc',
@@ -1734,7 +1735,6 @@
         'browser/webdata/web_data_service_unittest.cc',
         'browser/webdata/web_database_unittest.cc',
         'browser/webui/html_dialog_tab_contents_delegate_unittest.cc',
-        'browser/webui/options/language_options_handler_unittest.cc',
         'browser/webui/print_preview_ui_html_source_unittest.cc',
         'browser/webui/shown_sections_handler_unittest.cc',
         'browser/webui/sync_internals_ui_unittest.cc',
diff --git a/content/browser/webui/web_ui_factory.cc b/content/browser/webui/web_ui_factory.cc
index f73a516..3c9d6f8 100644
--- a/content/browser/webui/web_ui_factory.cc
+++ b/content/browser/webui/web_ui_factory.cc
@@ -12,6 +12,7 @@
 #include "chrome/browser/printing/print_dialog_cloud.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/browser/ui/webui/options/options_ui.h"
 #include "chrome/browser/webui/bookmarks_ui.h"
 #include "chrome/browser/webui/bug_report_ui.h"
 #include "chrome/browser/webui/constrained_html_ui.h"
@@ -25,7 +26,6 @@
 #include "chrome/browser/webui/html_dialog_ui.h"
 #include "chrome/browser/webui/net_internals_ui.h"
 #include "chrome/browser/webui/new_tab_ui.h"
-#include "chrome/browser/webui/options/options_ui.h"
 #include "chrome/browser/webui/plugins_ui.h"
 #include "chrome/browser/webui/print_preview_ui.h"
 #include "chrome/browser/webui/remoting_ui.h"