Run Sizes on Windows perf builders (take 2)

scripts/slave/recipe_modules/chromium/api.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.
 
 import re
 
 from recipe_engine import recipe_api
 from recipe_engine import util as recipe_util
 
 class TestLauncherFilterFileInputPlaceholder(recipe_util.Placeholder):
@@ skipping 378 matching lines @@
     if platform:
       sizes_args.extend(['--platform', platform])
     else:
       sizes_args.extend(['--platform', self.c.TARGET_PLATFORM])
 
     run_tests_args = ['--target', self.c.build_config_fs,
                       '--no-xvfb']
     properties_json = self.m.json.dumps(self.m.properties.legacy())
     run_tests_args.extend(['--factory-properties', properties_json,
                            '--build-properties', properties_json])
-    run_tests_args.extend(['--annotate=graphing',
-                           '--test-type=sizes',
+    run_tests_args.extend(['--test-type=sizes',
                            '--builder-name=%s' % self.m.properties['buildername'],
                            '--slave-name=%s' % self.m.properties['slavename'],
                            '--build-number=%s' % self.m.properties['buildnumber'],
                            '--run-python-script'])
 
     if perf_id:
       assert results_url is not None
-      run_tests_args.extend(['--results-url=%s' % results_url,
+      run_tests_args.extend(['--annotate=graphing',
+                             '--results-url=%s' % results_url,
                              '--perf-dashboard-id=sizes',
                              '--perf-id=%s' % perf_id])
 
       # If we have a clang revision, add that to the perf data point.
       # TODO(hans): We want this for all perf data, not just sizes.
       if hasattr(self, '_clang_version'):
         clang_rev = re.match(r'(\d+)(-\d+)?', self._clang_version).group(1)
         run_tests_args.append(
             "--perf-config={'r_clang_rev': '%s'}" % clang_rev)
 
@@ skipping 296 matching lines @@
       }))
 
   def get_annotate_by_test_name(self, test_name):
     return 'graphing'
 
   def download_lto_plugin(self):
     return self.m.python(
         name='download LTO plugin',
         script=self.m.path['checkout'].join(
             'build', 'download_gold_plugin.py'))