Make [OriginTrialEnabled] and [RuntimeEnabled] mutually exclusive

third_party/WebKit/Source/bindings/scripts/v8_interface.py

Index: third_party/WebKit/Source/bindings/scripts/v8_interface.py
diff --git a/third_party/WebKit/Source/bindings/scripts/v8_interface.py b/third_party/WebKit/Source/bindings/scripts/v8_interface.py
index 1ae50657d933c196e6a732cfad610380c8de68b7..c0a07f63af64a148fa0bf0c0f09fbd5f31b71c20 100644
--- a/third_party/WebKit/Source/bindings/scripts/v8_interface.py
+++ b/third_party/WebKit/Source/bindings/scripts/v8_interface.py
@@ -46,7 +46,7 @@ import v8_methods
 import v8_types
 from v8_types import cpp_ptr_type, cpp_template_type
 import v8_utilities
-from v8_utilities import (origin_trial_enabled_function, cpp_name_or_partial, capitalize, cpp_name, gc_type,
+from v8_utilities import (cpp_name_or_partial, capitalize, cpp_name, gc_type,

[iclelland, 2016/04/08 14:51:31]

nit: Why the inconsistency here? I see that it could be used with the module
name prefixed (because of the import on the previous line), but it seems like
either all of these functions should be fully scoped, or none of them.

[chasej, 2016/04/08 15:11:14]

This file was inconsistent to begin with. The import of
"origin_trial_enabled_function" wasn't actually used. The references in code
were all prefixed. Other files (e.g. v8_attributes.py, v8_methods.py) did not
import the specific function. I removed the import to make it more consistent
with usage in this file, and across the files.

I believe this inconsistency was inherited from the import of
runtime_enabled_function_name, in the initial implementation of
[APIExperimentEnabled]. You'll see runtime_enabled_function_name is used both
with and without prefix in this file. I'd guess that wasn't intentional, but I
think that should be addressed separately, if necessary.

                           has_extended_attribute_value, runtime_enabled_function_name,
                           extended_attribute_value_as_list, is_legacy_interface_type_checking)
 
@@ -159,13 +159,6 @@ def interface_context(interface):
     cpp_class_name_or_partial = cpp_name_or_partial(interface)
     v8_class_name_or_partial = v8_utilities.v8_class_name_or_partial(interface)
 
-    if 'RuntimeEnabled' in extended_attributes:
-        includes.add('platform/RuntimeEnabledFeatures.h')
-
-    if 'OriginTrialEnabled' in extended_attributes:
-        includes.add('core/inspector/ConsoleMessage.h')
-        includes.add('core/origin_trials/OriginTrials.h')
-
     context = {
         'cpp_class': cpp_class_name,
         'cpp_class_or_partial': cpp_class_name_or_partial,
@@ -190,7 +183,7 @@ def interface_context(interface):
         'is_typed_array_type': is_typed_array_type,
         'lifetime': 'Dependent' if (has_visit_dom_wrapper or is_dependent_lifetime) else 'Independent',
         'measure_as': v8_utilities.measure_as(interface, None),  # [MeasureAs]
-        'origin_trial_name': v8_utilities.origin_trial_name(interface),
+        'origin_trial_enabled_function': v8_utilities.origin_trial_enabled_function_name(interface, None),
         'parent_interface': parent_interface,
         'pass_cpp_type': cpp_template_type(
             cpp_ptr_type('PassRefPtr', 'RawPtr', this_gc_type),
@@ -261,7 +254,7 @@ def interface_context(interface):
     constant_configuration_constants = []
 
     for constant in constants:
-        if constant['measure_as'] or constant['deprecate_as'] or constant['origin_trial_name']:
+        if constant['measure_as'] or constant['deprecate_as'] or constant['origin_trial_enabled_function']:
             special_getter_constants.append(constant)
             continue
         runtime_enabled_function = constant['runtime_enabled_function']
@@ -612,20 +605,13 @@ def interface_context(interface):
 def constant_context(constant, interface):
     extended_attributes = constant.extended_attributes
 
-    if 'OriginTrialEnabled' in extended_attributes:
-        includes.add('core/inspector/ConsoleMessage.h')
-        includes.add('core/origin_trials/OriginTrials.h')
-
     return {
         'cpp_class': extended_attributes.get('PartialInterfaceImplementedAs'),
         'deprecate_as': v8_utilities.deprecate_as(constant),  # [DeprecateAs]
         'idl_type': constant.idl_type.name,
-        'is_origin_trial_enabled': v8_utilities.origin_trial_enabled_function(constant) or v8_utilities.origin_trial_enabled_function(interface),  # [OriginTrialEnabled]
         'measure_as': v8_utilities.measure_as(constant, interface),  # [MeasureAs]
         'name': constant.name,
-        'origin_trial_enabled': v8_utilities.origin_trial_enabled_function(constant),  # [OriginTrialEnabled]
-        'origin_trial_enabled_per_interface': v8_utilities.origin_trial_enabled_function(interface),  # [OriginTrialEnabled]
-        'origin_trial_name': extended_attributes.get('OriginTrialEnabled'),  # [OriginTrialEnabled]
+        'origin_trial_enabled_function': v8_utilities.origin_trial_enabled_function_name(constant, interface),  # [OriginTrialEnabled]
         # FIXME: use 'reflected_name' as correct 'name'
         'reflected_name': extended_attributes.get('Reflect', constant.name),
         'runtime_enabled_function': runtime_enabled_function_name(constant),  # [RuntimeEnabled]