Delete no longer needed pagesets, add new pagesets and make names more readable

tools/skp/page_sets/skia_wikipedia_desktop.py

Index: tools/skp/page_sets/skia_wikipedia_desktop.py
diff --git a/tools/skp/page_sets/skia_carsvg_desktop.py b/tools/skp/page_sets/skia_wikipedia_desktop.py
similarity index 65%
copy from tools/skp/page_sets/skia_carsvg_desktop.py
copy to tools/skp/page_sets/skia_wikipedia_desktop.py
index c8bb4ca8ddb18769f81010f08d514bb4faeee024..fa7b70ce53f9600989297293d5fac897b78b6642 100644
--- a/tools/skp/page_sets/skia_carsvg_desktop.py
+++ b/tools/skp/page_sets/skia_wikipedia_desktop.py
@@ -1,4 +1,4 @@
-# Copyright 2014 The Chromium Authors. All rights reserved.
+# Copyright 2015 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.
 # pylint: disable=W0401,W0614
@@ -16,21 +16,21 @@ class SkiaBuildbotDesktopPage(page_module.Page):
         page_set=page_set,
         credentials_path='data/credentials.json')
     self.user_agent_type = 'desktop'
-    self.archive_data_file = 'data/skia_carsvg_desktop.json'
+    self.archive_data_file = 'data/skia_wikipedia_desktop.json'
 
 
-class SkiaCarsvgDesktopPageSet(page_set_module.PageSet):
+class SkiaWikipediaDesktopPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(SkiaCarsvgDesktopPageSet, self).__init__(
+    super(SkiaWikipediaDesktopPageSet, self).__init__(
       user_agent_type='desktop',
-      archive_data_file='data/skia_carsvg_desktop.json')
+      archive_data_file='data/skia_wikipedia_desktop.json')
 
     urls_list = [
-      # Why: from fmalita
-      'http://codinginparadise.org/projects/svgweb/samples/svg-files/car.svg',
+      # Why: stress tests for fonts (from skia:3574).
+      'http://www.wikipedia.org/',
     ]
 
     for url in urls_list: