Change for preparation for reference-build on perfbot (media)

chrome/test/functional/media/media_test_matrix.py

 #!/usr/bin/python
 
 # Copyright (c) 2011 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 csv
 import os
 import random
 
@@ skipping 39 matching lines @@
       csv.Error if the number of columns is not the same as the number of
         tiles.
     """
     # Clean up all data.
     self._exts = []
     self._specs = {}
     self._video_titles = []
     self._tags = {}
     file = open(csv_file, 'rb')
     reader = csv.reader(file)
-    for counter, row in enumerate(reader):
-      if counter == 0:
+    for row_counter, row in enumerate(reader):
+      if row_counter == 0:
         # First row is comment. So, skip it.
         pass
-      elif counter == 1:
+      elif row_counter == 1:
         # Second row is for header (video titles).
-        for title in row[1:]:
-          self._video_titles.append(title)
+        for column_counter, title in enumerate(row[1:]):
+          # Skip the first column since it is for tag ('video' or 'audio').
+          if column_counter > 0:
+            self._video_titles.append(title)
           self._specs[title] = []
       else:
         # Error checking is done here based on the number of titles
-        if len(self._video_titles) != len(row) - 1:
-          print "Row %d should have %d columns but has %d columns" % (counter,
-            len(self._video_titles), len(row))
+        if len(self._video_titles) != len(row) - 2:
+          print "Row %d should have %d columns but has %d columns" % (
+              row_counter, len(self._video_titles), len(row))
           raise csv.Error
         # First column should contain extension.
         self._exts.append(row[0])
         # Second column should contain tag (audio or video).
         self._tags[row[0]] = row[1]
         for i in range(len(row) - 2):
           self._specs[self._video_titles[i]].append(row[i + 2])
     file.close()
 
   def _GenerateMediaInfo(self, sub_type, name, media_test_matrix_home_url):
@@ skipping 106 matching lines @@
     """
     media_infos = []
     for i in range(0, len(self._video_titles)-1):
       name = self._video_titles[i]
       for sub_type in range(len(self._exts)):
         (info, url, link, tag, is_video, nickname) = (
             self._GenerateMediaInfo(sub_type, name, media_matrix_home_url))
         tag = ['audio', 'video'][is_video]
         if ((not NOT_AVAILABLE_STRING in info) and
             ((not video_only) or (video_only and is_video))):
-          media_infos.append([url, nickname, tag])
+          media_infos.append([tag, url, nickname])
     return media_infos
 
   @staticmethod
   def LookForMediaInfoInCompactFormByNickName(compact_list, target):
     """Look for video by its nickname in the compact_list.
 
     Args:
       compact_list: a list generated by GenerateAllMediaInfosInCompactForm.
       target: a target nickname string to look for.
 
     Returns:
       A tuple (url, nickname, tag) where nickname is a target string.
         url: URL of the video/audio.
         nickname: nickname of the video/audio for presentation
                   (such as bear.webm).
         tag: HTML5 tag for the video/audio.
     """
-    for url, nickname, tag in compact_list:
+    for tag, url, nickname in compact_list:
       if target == nickname:
         return (tag, url, nickname)