Revert "Revert of [Android] Migrate javascript settings to a content setting from a pref. (patchset…

content/content_browser.gypi

 # Copyright (c) 2012 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.
 
 {
   'dependencies': [
     '../base/base.gyp:base_static',
     '../crypto/crypto.gyp:crypto',
     '../device/vibration/vibration.gyp:device_vibration',
     '../device/vibration/vibration.gyp:device_vibration_mojo_bindings',
@@ skipping 289 matching lines @@
       'browser/android/browser_surface_texture_manager.cc',
       'browser/android/browser_surface_texture_manager.h',
       'browser/android/child_process_launcher_android.cc',
       'browser/android/child_process_launcher_android.h',
       'browser/android/composited_touch_handle_drawable.cc',
       'browser/android/composited_touch_handle_drawable.h',
       'browser/android/content_protocol_handler_impl.cc',
       'browser/android/content_protocol_handler_impl.h',
       'browser/android/content_readback_handler.cc',
       'browser/android/content_readback_handler.h',
-      'browser/android/content_settings.cc',
-      'browser/android/content_settings.h',
       'browser/android/content_startup_flags.cc',
       'browser/android/content_startup_flags.h',
       'browser/android/content_video_view.cc',
       'browser/android/content_video_view.h',
       'browser/android/content_view_core_impl.cc',
       'browser/android/content_view_core_impl.h',
       'browser/android/content_view_render_view.cc',
       'browser/android/content_view_render_view.h',
       'browser/android/content_view_statics.cc',
       'browser/android/content_view_statics.h',
@@ skipping 1649 matching lines @@
         'browser/media/media_web_contents_observer.h',
       ],
     }],
     ['OS == "linux" and use_openssl==1', {
       'dependencies': [
         '../third_party/boringssl/boringssl.gyp:boringssl',
       ],
     }],
   ],
 }