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

chrome/chrome_tests.gypi

Index: chrome/chrome_tests.gypi
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 12c2654eef46552a5914df3c97187d65bca4a222..f0e56997c0ea7b4ffe4f2df64f9ffd33a0b0cff2 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -550,7 +550,6 @@
         'browser/appcache/appcache_ui_test.cc',
         'browser/browser_encoding_uitest.cc',
         'browser/dom_ui/new_tab_ui_uitest.cc',
-        'browser/dom_ui/options/options_ui_uitest.cc',
         'browser/dom_ui/print_preview_ui_uitest.cc',
         'browser/download/download_uitest.cc',
         'browser/download/save_page_uitest.cc',
@@ -581,6 +580,7 @@
         'browser/ui/tests/browser_uitest.cc',
         'browser/ui/views/find_bar_host_uitest.cc',
         'browser/webui/bookmarks_ui_uitest.cc',
+        'browser/webui/options/options_ui_uitest.cc',
         'common/logging_chrome_uitest.cc',
         'renderer/external_extension_uitest.cc',
         'test/automation/automation_proxy_uitest.cc',
@@ -1257,7 +1257,6 @@
         'browser/debugger/devtools_manager_unittest.cc',
         'browser/device_orientation/provider_unittest.cc',
         'browser/dom_ui/html_dialog_tab_contents_delegate_unittest.cc',
-        'browser/dom_ui/options/language_options_handler_unittest.cc',
         'browser/dom_ui/print_preview_ui_html_source_unittest.cc',
         'browser/dom_ui/shown_sections_handler_unittest.cc',
         'browser/dom_ui/sync_internals_ui_unittest.cc',
@@ -1743,6 +1742,7 @@
         'browser/webdata/web_data_service_test_util.h',
         'browser/webdata/web_data_service_unittest.cc',
         'browser/webdata/web_database_unittest.cc',
+        'browser/webui/options/language_options_handler_unittest.cc',
         'browser/webui/web_ui_unittest.cc',
         'browser/web_resource/promo_resource_service_unittest.cc',
         'common/bzip2_unittest.cc',