Move content settings extension API to content_settings dir.

chrome/chrome_tests.gypi

Index: chrome/chrome_tests.gypi
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 330da1b562cc23763fb59a537b287cb9c413b7cd..f8a9cfe6b9ab41fbda5c4370f4f487298802b354 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1163,6 +1163,8 @@
         'browser/event_disposition.cc',
         'browser/event_disposition.h',
         'browser/extensions/api/alarms/alarms_api_unittest.cc',
+        'browser/extensions/api/content_settings/content_settings_store_unittest.cc',
+        'browser/extensions/api/content_settings/content_settings_unittest.cc',
         'browser/extensions/api/cookies/cookies_unittest.cc',
         'browser/extensions/api/declarative/initializing_rules_registry_unittest.cc',
         'browser/extensions/api/declarative/rules_registry_service_unittest.cc',
@@ -1190,8 +1192,6 @@
         'browser/extensions/component_loader_unittest.cc',
         'browser/extensions/convert_user_script_unittest.cc',
         'browser/extensions/convert_web_app_unittest.cc',
-        'browser/extensions/extension_content_settings_store_unittest.cc',
-        'browser/extensions/extension_content_settings_unittest.cc',
         'browser/extensions/extension_creator_filter_unittest.cc',
         'browser/extensions/extension_event_router_forwarder_unittest.cc',
         'browser/extensions/extension_function_test_utils.cc',
@@ -2651,6 +2651,7 @@
         'browser/extensions/api/browsing_data/browsing_data_test.cc',
         'browser/extensions/api/cookies/cookies_apitest.cc',
         'browser/extensions/api/context_menu/context_menu_apitest.cc',
+        'browser/extensions/api/content_settings/content_settings_apitest.cc',
         'browser/extensions/api/declarative/declarative_apitest.cc',
         'browser/extensions/api/dns/dns_apitest.cc',
         'browser/extensions/api/extension_action/browser_action_apitest.cc',
@@ -2695,7 +2696,6 @@
         'browser/extensions/extension_browsertest.h',
         'browser/extensions/extension_browsertests_misc.cc',
         'browser/extensions/extension_chrome_auth_private_apitest.cc',
-        'browser/extensions/extension_content_settings_apitest.cc',
         'browser/extensions/extension_context_menu_browsertest.cc',
         'browser/extensions/extension_crash_recovery_browsertest.cc',
         'browser/extensions/extension_debugger_apitest.cc',