Docserver: Correctly disambiguate between what 'platform' means in a features

chrome/common/extensions/docs/server2/features_utility.py

 # Copyright 2013 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.
 
 '''
 Utility functions for working with the Feature abstraction. Features are grouped
 into a dictionary by name. Each Feature is guaranteed to have the following two
 keys:
   name - a string, the name of the feature
   platform - a list containing 'apps' or 'extensions', both, or neither.
@@ skipping 47 matching lines @@
         extension_types = set()
         for value in available_values:
           extension_types.update(value['extension_types'])
         value = [subvalue for subvalue in available_values
                  if subvalue['channel'] == 'stable'][0]
         value['extension_types'] = list(extension_types)
 
     if ignore_feature(name, value):
       continue
 
-    features[name] = { 'platforms': [] }
+    # Now we transform 'extension_types' into the more useful 'platforms'.
+    #
+    # But first, note that 'platforms' has a double meaning. In the docserver
+    # model (what we're in the process of generating) it means 'apps' vs
+    # 'extensions'. In the JSON features as read from Chrome it means 'win' vs
+    # 'mac'. Ignore the latter.
+    value.pop('platforms', None)
+    extension_types = value.pop('extension_types', None)
 
-    extension_types = value.pop('extension_types', None)
+    platforms = []
     if extension_types is not None:
-      features[name]['platforms'] = _GetPlatformsForExtensionTypes(
-          extension_types)
+      platforms = _GetPlatformsForExtensionTypes(extension_types)
 
-    features[name]['name'] = name
+    features[name] = {
+      'name': name,
+      'platforms': platforms,
+    }
     features[name].update(value)
 
   return features
 
 def Filtered(features, platform=None):
   '''Create a new Features dictionary from |features| that contains only items
   relevant to |platform|. Items retained are deepcopied. Returns new features
   dictionary.
   '''
   filtered_features = {}
@@ skipping 16 matching lines @@
     else:
       features[key] = value
 
     # Ensure the Feature schema is enforced for all added items.
     if not 'name' in features[key]:
       features[key]['name'] = key
     if not 'platforms' in features[key]:
       features[key]['platforms'] = []
 
   return features