Merge 143917

Source/WebKit/chromium/features.gypi

 #
 # Copyright (C) 2009 Google Inc. All rights reserved.
 # 
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 # 
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
@@ skipping 76 matching lines @@
       'ENABLE_LINK_PREFETCH=1',
       'ENABLE_LINK_PRERENDER=1',
       'ENABLE_MATHML=0',
       'ENABLE_MEDIA_SOURCE=1',
       'ENABLE_MEDIA_STATISTICS=1',
       'ENABLE_MEDIA_STREAM=<(enable_webrtc)',
       'ENABLE_METER_ELEMENT=1',
       'ENABLE_MHTML=1',
       'ENABLE_MICRODATA=0',
       'ENABLE_MOUSE_CURSOR_SCALE=1',
-      'ENABLE_NAVIGATOR_CONTENT_UTILS=1',
       'ENABLE_NOSNIFF=1',
       'ENABLE_PAGE_VISIBILITY_API=1',
       'ENABLE_PERFORMANCE_TIMELINE=1',
       'ENABLE_POINTER_LOCK=1',
       'ENABLE_PROGRESS_ELEMENT=1',
       'ENABLE_PROXIMITY_EVENTS=0',
       'ENABLE_QUOTA=1',
       'ENABLE_REQUEST_ANIMATION_FRAME=1',
       'ENABLE_REQUEST_AUTOCOMPLETE=1',
       'ENABLE_RESOLUTION_MEDIA_QUERY=0',
@@ skipping 60 matching lines @@
           'ENABLE_FAST_MOBILE_SCROLLING=1',
           'ENABLE_INPUT_SPEECH=0',
           'ENABLE_INPUT_TYPE_COLOR=0',
           'ENABLE_INPUT_TYPE_WEEK=0',
           'ENABLE_LEGACY_NOTIFICATIONS=0',
           'ENABLE_MEDIA_CAPTURE=1',
           'ENABLE_NOTIFICATIONS=0',
           'ENABLE_ORIENTATION_EVENTS=1',
           'ENABLE_PAGE_POPUP=0',
           'ENABLE_PRINTING=0',
-          'ENABLE_REGISTER_PROTOCOL_HANDLER=0',
+          'ENABLE_NAVIGATOR_CONTENT_UTILS=0',
           # FIXME: Disable once the linking error has been resolved.
           # https://bugs.webkit.org/show_bug.cgi?id=88636
           'ENABLE_SHARED_WORKERS=1',
           'ENABLE_WEB_AUDIO=0',
           'WTF_USE_NATIVE_FULLSCREEN_VIDEO=1',
         ],
         'enable_touch_icon_loading': 1,
       }, { # OS!="android"
         'feature_defines': [
           'ENABLE_CALENDAR_PICKER=1',
           'ENABLE_DATALIST_ELEMENT=1',
           'ENABLE_INPUT_SPEECH=1',
           'ENABLE_INPUT_TYPE_COLOR=1',
           'ENABLE_INPUT_TYPE_WEEK=1',
           'ENABLE_INPUT_MULTIPLE_FIELDS_UI=1',
           'ENABLE_LEGACY_NOTIFICATIONS=1',
           'ENABLE_MEDIA_CAPTURE=0',
+          'ENABLE_NAVIGATOR_CONTENT_UTILS=1',
           'ENABLE_NOTIFICATIONS=1',
           'ENABLE_ORIENTATION_EVENTS=0',
           'ENABLE_PAGE_POPUP=1',
           'ENABLE_PRINTING=1',
           'ENABLE_SHARED_WORKERS=1',
           'ENABLE_WEB_AUDIO=1',
         ],
       }],
       ['OS=="linux" or OS=="mac"', {
         'feature_defines': [
@@ skipping 49 matching lines @@
         ],
       }],
       ['use_default_render_theme==1', {
         'feature_defines': [
           'ENABLE_DEFAULT_RENDER_THEME=1',
         ],
       }],
     ],
   },
 }