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

tools/skp/page_sets/skia_amazon_desktop.py

Index: tools/skp/page_sets/skia_amazon_desktop.py
diff --git a/tools/skp/page_sets/skia_amazon_desktop.py b/tools/skp/page_sets/skia_amazon_desktop.py
deleted file mode 100644
index 3e1bd1ed2e199c811517d1c52832fd0ce1fbecb2..0000000000000000000000000000000000000000
--- a/tools/skp/page_sets/skia_amazon_desktop.py
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2014 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
-
-
-from telemetry.page import page as page_module
-from telemetry.page import page_set as page_set_module
-
-
-class SkiaBuildbotDesktopPage(page_module.Page):
-
-  def __init__(self, url, page_set):
-    super(SkiaBuildbotDesktopPage, self).__init__(
-        url=url,
-        page_set=page_set,
-        credentials_path = 'data/credentials.json')
-    self.user_agent_type = 'desktop'
-    self.archive_data_file = 'data/skia_amazon_desktop.json'
-
-  def RunNavigateSteps(self, action_runner):
-    action_runner.NavigateToPage(self)
-    action_runner.Wait(15)
-
-
-class SkiaAmazonDesktopPageSet(page_set_module.PageSet):
-
-  """ Pages designed to represent the median, not highly optimized web """
-
-  def __init__(self):
-    super(SkiaAmazonDesktopPageSet, self).__init__(
-      user_agent_type='desktop',
-      archive_data_file='data/skia_amazon_desktop.json')
-
-    urls_list = [
-      # Why: #1 world commerce website by visits; #3 commerce in the US by time
-      # spent.
-      'http://www.amazon.com',
-    ]
-
-    for url in urls_list:
-      self.AddUserStory(SkiaBuildbotDesktopPage(url, self))