Fix problems with angle bot's configurations

tools/bench_pictures.cfg

 # 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.
 
 
 """
 This file defines the configurations in which bench_pictures should be run
 on various platforms. The buildbots read these configurations from the
 bench_pictures_cfg dictionary. Everything else in this file exists to help in
 constructing that dictionary.
@@ skipping 47 matching lines @@
 default_no_gpu = [cfg for cfg in default_configs if cfg['config'] != 'gpu']
 
 
 msaa4 = Config(config='msaa4', viewport=[str(DEFAULT_VIEWPORT_X),
                                          str(DEFAULT_VIEWPORT_Y)])
 
 msaa16 = Config(config='msaa16', viewport=[str(DEFAULT_VIEWPORT_X),
                                            str(DEFAULT_VIEWPORT_Y)])
 
 viewport_angle = Config(config='angle',
-                        viewport=[DEFAULT_TILE_X, DEFAULT_TILE_Y])
+                        viewport=[DEFAULT_VIEWPORT_X, DEFAULT_VIEWPORT_Y])
 
 # This dictionary defines the sets of configs for all platforms. Each config is
 # a dictionary of key/value pairs directly corresponding to the command-line
 # flags passed to bench_pictures.
 bench_pictures_cfg = {
-  'angle': [viewport_angle, msaa4],
+  'angle': [viewport_angle],
   'debug': [ViewportBitmapConfig(DEFAULT_VIEWPORT_X, DEFAULT_VIEWPORT_Y)],
   'default': default_configs,
   'no_gpu': default_no_gpu,
   'nexus_s': default_no_gpu,
   'xoom': default_configs,
   'galaxy_nexus': default_configs,
   'nexus_4': default_configs + [msaa4],
   'nexus_7': default_configs,
   'nexus_10': default_configs + [msaa4],
   'razr_i': default_configs + [msaa4],
   'intel_rhb': default_no_gpu,
   'default_msaa16': default_configs + [msaa16],
 }