Extensions: Fix DocServer assert failures.

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

Index: chrome/common/extensions/docs/server2/availability_finder.py
diff --git a/chrome/common/extensions/docs/server2/availability_finder.py b/chrome/common/extensions/docs/server2/availability_finder.py
index 35a9df1ad9f4fb902821df7cb57da60e11c2d34d..e8f6bc6dbf9717dbbba32d2f13f7ec8212ba311b 100644
--- a/chrome/common/extensions/docs/server2/availability_finder.py
+++ b/chrome/common/extensions/docs/server2/availability_finder.py
@@ -144,11 +144,12 @@ class AvailabilityFinder(object):
         JSON_TEMPLATES + 'api_availabilities.json').Get().get(node_name)
     if node_info is None:
       return None
-    if node_info['channel'] == 'stable':
-      return AvailabilityInfo(
-          self._branch_utility.GetStableChannelInfo(node_info['version']))
-    return AvailabilityInfo(
-        self._branch_utility.GetChannelInfo(node_info['channel']))
+
+    channel_info = self._branch_utility.GetStableChannelInfo(

[Devlin, 2017/03/13 20:38:18]

nit: I think this is quite a bit more readable as:
if node_info['channel'] == 'stable':
  channel_info = self._branch_utility.GetStableChannelInfo(node_info['version'])
else
  channel_info = self._branch_utility.GetChannelInfo(node_info['channel'])

It's one more line of code, but python's ternaries are weird enough and the line
breaking is awkward enough that I find it very difficult to parse this in its
current form. :)

[karandeepb, 2017/03/14 01:02:02]

Done.

+        node_info['version']) if node_info['channel'] == 'stable' \
+        else self._branch_utility.GetChannelInfo(node_info['channel'])
+
+    return AvailabilityInfo(channel_info) if channel_info else None
 
   @memoize
   def _CreateAPISchemaFileSystem(self, file_system):