Revert 119423 - Revert 119306 - Turn web intents build flag on.

build/common.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.
 
 # IMPORTANT:
 # Please don't directly include this file if you are building via gyp_chromium,
 # since gyp_chromium is automatically forcing its inclusion.
 {
   # Variables expected to be overriden on the GYP command line (-D) or by
   # ~/.gyp/include.gypi.
@@ skipping 189 matching lines @@
       # See https://sites.google.com/a/google.com/chrome-msk/dev/boot-speed-up-effort
       'order_text_section%' : "",
 
       # Set to 1 compile with -fPIC cflag on linux. This is a must for shared
       # libraries on linux x86-64 and arm, plus ASLR.
       'linux_fpic%': 1,
 
       # Enable navigator.registerProtocolHandler and supporting UI.
       'enable_register_protocol_handler%': 1,
 
-      # Enable Web Intents support in WebKit, dispatching of intents,
-      # and extensions Web Intents support.
-      'enable_web_intents%': 1,
-
-      # Enable Web Intents web content registration via HTML element
-      # and WebUI managing such registrations.
-      'enable_web_intents_tag%': 0,
+      # Enable Web Intents and supporting UI.
+      'enable_web_intents%': 0,
 
       # Webrtc compilation is enabled by default. Set to 0 to disable.
       'enable_webrtc%': 1,
 
       # PPAPI by default does not support plugins making calls off the main
       # thread. Set to 1 to turn on experimental support for out-of-process
       # plugins to make call of the main thread.
       'enable_pepper_threading%': 0,
 
       # XInput2 multitouch support is disabled by default (use_xi2_mt=0).
@@ skipping 198 matching lines @@
     'p2p_apis%': '<(p2p_apis)',
     'configuration_policy%': '<(configuration_policy)',
     'safe_browsing%': '<(safe_browsing)',
     'input_speech%': '<(input_speech)',
     'notifications%': '<(notifications)',
     'clang_use_chrome_plugins%': '<(clang_use_chrome_plugins)',
     'asan%': '<(asan)',
     'order_text_section%': '<(order_text_section)',
     'enable_register_protocol_handler%': '<(enable_register_protocol_handler)',
     'enable_web_intents%': '<(enable_web_intents)',
-    'enable_web_intents_tag%': '<(enable_web_intents_tag)',
     'enable_plugin_installation%': '<(enable_plugin_installation)',
     'use_canvas_skia_skia%': '<(use_canvas_skia_skia)',
     # Whether to build for Wayland display server
     'use_wayland%': 0,
 
     # Use system yasm instead of bundled one.
     'use_system_yasm%': 0,
 
     # Default to enabled PIE; this is important for ASLR but we need to be
     # able to turn it off for remote debugging on Chromium OS
@@ skipping 454 matching lines @@
       ['use_virtual_keyboard==1 and chromeos==1', {
         'use_ibus%': 1,
       }, {
         'use_ibus%': 0,
       }],
 
       ['enable_register_protocol_handler==1', {
         'grit_defines': ['-D', 'enable_register_protocol_handler'],
       }],
 
-      ['enable_web_intents_tag==1', {
-        'grit_defines': ['-D', 'enable_web_intents_tag'],
+      ['enable_web_intents==1', {
+        'grit_defines': ['-D', 'enable_web_intents'],
       }],
 
       ['asan==1', {
         'clang%': 1,
         # Do not use Chrome plugins for Clang. The Clang version in
         # third_party/asan may be different from the default one.
         'clang_use_chrome_plugins%': 0,
       }],
     ],
     # List of default apps to install in new profiles.  The first list contains
@@ skipping 1819 matching lines @@
     # settings in target dicts.  SYMROOT is a special case, because many other
     # Xcode variables depend on it, including variables such as
     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something
     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
     # files to appear (when present) in the UI as actual files and not red
     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
     # and therefore SYMROOT, needs to be set at the project level.
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
 }