Docserver: Use the testing URL for the new omahaproxy history API.

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

 # 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.
 
 import json
 import logging
 import operator
 
 from appengine_url_fetcher import AppEngineUrlFetcher
 import url_constants
@@ skipping 148 matching lines @@
       version_json = json.loads(self._fetch_result.Get().content)
     except Exception as e:
       # This can happen if omahaproxy is misbehaving, which we've seen before.
       # Quick hack fix: just serve from trunk until it's fixed.
       logging.error('Failed to fetch or parse branch from omahaproxy: %s! '
                     'Falling back to "trunk".' % e)
       return 'trunk'
 
     numbers = {}
     for entry in version_json:
-      if entry['os'] not in ['win', 'linux', 'mac', 'cros']:
+      if entry['os'] not in ('win', 'linux', 'mac', 'cros'):
         continue
       for version in entry['versions']:
         if version['channel'] != channel_name:
           continue
         if data_type == 'branch':
           number = version['version'].split('.')[2]
         elif data_type == 'version':
           number = version['version'].split('.')[0]
         if number not in numbers:
           numbers[number] = 0
@@ skipping 11 matching lines @@
     data stored on omahaproxy (see url_constants).
     '''
     if version == 'trunk':
       return 'trunk'
 
     branch = self._branch_object_store.Get(str(version)).Get()
     if branch is not None:
       return branch
 
     version_json = json.loads(self._history_result.Get().content)
-    for entry in version_json['events']:
-      # Here, entry['title'] looks like: '<title> - <version>.##.<branch>.##'
-      version_title = entry['title'].split(' - ')[1].split('.')
+    for entry in version_json:
+      version_title = entry['version'].split('.')
       if version_title[0] == str(version):
         self._branch_object_store.Set(str(version), version_title[2])
         return version_title[2]
 
     raise ValueError('The branch for %s could not be found.' % version)
 
   def GetChannelForVersion(self, version):
     '''Returns the name of the development channel corresponding to a given
     version number.
     '''
     for channel_info in self.GetAllChannelInfo():
       if channel_info.channel == 'stable' and version <= channel_info.version:
         return channel_info.channel
       if version == channel_info.version:
         return channel_info.channel
 
   def GetLatestVersionNumber(self):
     '''Returns the most recent version number found using data stored on
     omahaproxy.
     '''
     latest_version = self._version_object_store.Get('latest').Get()
     if latest_version is not None:
       return latest_version
 
     version_json = json.loads(self._history_result.Get().content)
     latest_version = 0
-    for entry in version_json['events']:
-      version_title = entry['title'].split(' - ')[1].split('.')
+    for entry in version_json:
+      version_title = entry['version'].split('.')
       version = int(version_title[0])
       if version > latest_version:
         latest_version = version
 
     self._version_object_store.Set('latest', latest_version)
     return latest_version