Remove less then useful configs from bench_pictures runs

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 27 matching lines @@
   TiledBitmapConfig(DEFAULT_TILE_X, DEFAULT_TILE_Y),
   TiledGPUConfig(DEFAULT_TILE_X, DEFAULT_TILE_Y),
 
   # CopyTiles
   CopyTilesConfig(DEFAULT_TILE_X, DEFAULT_TILE_Y),
 
   # Record
   RecordConfig(),
 
   # Multi-threaded
-  MultiThreadTileConfig(2, DEFAULT_TILE_X, DEFAULT_TILE_Y),
-  MultiThreadTileConfig(3, DEFAULT_TILE_X, DEFAULT_TILE_Y),
   MultiThreadTileConfig(4, DEFAULT_TILE_X, DEFAULT_TILE_Y),
 
   # Different tile sizes
   TiledBitmapConfig(512, 512),
-  TiledBitmapConfig(1024, 256),
-  TiledBitmapConfig(1024, 64),
 
   # Different bounding box heirarchies, for different modes.
   RecordRTreeConfig(),
   PlaybackCreationRTreeConfig(),
   TileRTreeConfig(            DEFAULT_TILE_X, DEFAULT_TILE_Y),
   RecordGridConfig(           DEFAULT_TILE_X, DEFAULT_TILE_Y),
   PlaybackCreationGridConfig( DEFAULT_TILE_X, DEFAULT_TILE_Y),
   TileGridConfig(             DEFAULT_TILE_X, DEFAULT_TILE_Y),
 ]
 
@@ skipping 43 matching lines @@
   'angle': [TiledConfig(DEFAULT_TILE_X, DEFAULT_TILE_Y, config='angle')],
   'debug': [TiledBitmapConfig(DEFAULT_TILE_X, DEFAULT_TILE_Y)],
   'default': default_configs,
   'no_gpu': [cfg for cfg in default_configs if cfg['config'] != 'gpu'],
   'nexus_s':      AndroidConfigList((256, 256), 0.4897, [],  (480,  800),
                                     do_gpu=False),
   'xoom':         AndroidConfigList((256, 256), 1.2244, [],  (1200, 800)),
   'galaxy_nexus': AndroidConfigList((256, 256), 0.8163, [],  (800,  1280)) + \
                       [msaa4],
   'nexus_4':      AndroidConfigList((256, 256), 0.7836, [],  (768,  1280)),
-  'nexus_7':      AndroidConfigList((256, 256), 1.3061, [2], (1280, 800)),
+  'nexus_7':      AndroidConfigList((256, 256), 1.3061, [4], (1280, 800)),
   'nexus_10':     AndroidConfigList((512, 512), 2.6122, [],  (2560, 1600),
                                     do_gpu=False) + [msaa4],
   'razr_i':       AndroidConfigList((256, 256), 0.5510, [],  (540, 960)) + \
                       [msaa4],
   'intel_rhb':    AndroidConfigList((256, 256), 0.5510, [],  (540, 960)) + \
                       [msaa4],
 }