Revert 119284 - Turn web intents build flag on. Move the command-line flag to default on.

chrome/browser/resources/options2/options_bundle.js

 // 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.
 //
 // This file exists to aggregate all of the javascript used by the
 // settings page into a single file which will be flattened and served
 // as a single resource.
 <include src="controlled_setting.js"></include>
 <include src="deletable_item_list.js"></include>
 <include src="inline_editable_list.js"></include>
@@ skipping 59 matching lines @@
 <include src="cookies_list.js"></include>
 <include src="cookies_view.js"></include>
 <include src="font_settings.js"></include>
 <if expr="pp_ifdef('enable_register_protocol_handler')">
   <include src="handler_options.js"></include>
   <include src="handler_options_list.js"></include>
 </if>
 <include src="home_page_overlay.js"></include>
 <include src="import_data_overlay.js"></include>
 <include src="instant_confirm_overlay.js"></include>
-<if expr="pp_ifdef('enable_web_intents_tag')">
+<if expr="pp_ifdef('enable_web_intents')">
   <include src="intents_list.js"></include>
   <include src="intents_view.js"></include>
 </if>
 <include src="language_add_language_overlay.js"></include>
 <include src="language_list.js"></include>
 <include src="language_options.js"></include>
 <include src="manage_profile_overlay.js"></include>
 <include src="password_manager.js"></include>
 <include src="password_manager_list.js"></include>
 <include src="profiles_icon_grid.js"></include>
 <include src="search_engine_manager.js"></include>
 <include src="search_engine_manager_engine_list.js"></include>
 <include src="search_page.js"></include>
 <include src="startup_overlay.js"></include>
 <include src="../sync_setup_overlay.js"></include>
 <include src="../uber/uber_utils.js"></include>
 <include src="options.js"></include>