Rename simple_mobile_sites pages for consistency

Rename so that pages follow the same naming convention as those in the
rendering page sets

Bug: 847857
Change-Id: I2fcd7ddd3b0b67c00d457f1a47ed19c4686ce9e5
Reviewed-on: https://chromium-review.googlesource.com/1081017Reviewed-by: Ned Nguyen <nednguyen@google.com>
Commit-Queue: Amy Qiu <amyqiu@google.com>
Cr-Commit-Position: refs/heads/master@{#563616}

tools/perf/expectations.config

@@ -200,7 +200,7 @@ crbug.com/685342 [ Nexus_7 ] smoothness.pathological_mobile_sites/* [ Skip ]
 crbug.com/822925 [ Android_Webview ] smoothness.pathological_mobile_sites/http://sports.yahoo.com/ [ Skip ]
 
 # Benchmark: smoothness.simple_mobile_sites
-crbug.com/750833 [ Android_Webview ] smoothness.simple_mobile_sites/https://www.flickr.com/ [ Skip ]
+crbug.com/750833 [ Android_Webview ] smoothness.simple_mobile_sites/flickr_scroll [ Skip ]
 
 # Benchmark: smoothness.sync_scroll.key_mobile_sites_smooth
 crbug.com/756119 [ All ] smoothness.sync_scroll.key_mobile_sites_smooth/digg [ Skip ]

tools/perf/page_sets/data/simple_mobile_sites.json

 {
     "archives": {
-        "http://m.nytimes.com/": {
+        "nytimes_scroll": {
             "DEFAULT": "simple_mobile_sites_002.wprgo"
         },
-        "http://m.us.wsj.com/": {
+        "ebay_scroll": {
             "DEFAULT": "simple_mobile_sites_002.wprgo"
         },
-        "http://www.apple.com/mac/": {
+        "nyc_gov_scroll": {
             "DEFAULT": "simple_mobile_sites_002.wprgo"
         },
-        "http://www.ebay.co.uk/": {
-            "DEFAULT": "simple_mobile_sites_002.wprgo"
-        },
-        "http://www.nyc.gov": {
-            "DEFAULT": "simple_mobile_sites_002.wprgo"
-        },
-        "https://www.flickr.com/": {
-            "DEFAULT": "simple_mobile_sites_002.wprgo"
-        },
-        "https://www.yahoo.com/": {
+        "flickr_scroll": {
             "DEFAULT": "simple_mobile_sites_002.wprgo"
         }
     },

tools/perf/page_sets/simple_mobile_sites.py

@@ -6,25 +6,20 @@ from telemetry.page import shared_page_state
 from telemetry import story
 
 
-class SimplePage(page_module.Page):
+class SimpleScrollPage(page_module.Page):
 
-  def __init__(self, url, page_set):
-    super(SimplePage, self).__init__(
+  def __init__(self, name, url, page_set):
+    super(SimpleScrollPage, self).__init__(
+        name=name,
         url=url,
         page_set=page_set,
-        shared_page_state_class=shared_page_state.Shared10InchTabletPageState,
-        name=url)
+        shared_page_state_class=shared_page_state.Shared10InchTabletPageState)
 
   def RunNavigateSteps(self, action_runner):
-    super(SimplePage, self).RunNavigateSteps(action_runner)
+    super(SimpleScrollPage, self).RunNavigateSteps(action_runner)
     # TODO(epenner): Remove this wait (http://crbug.com/366933)
     action_runner.Wait(5)
 
-class SimpleScrollPage(SimplePage):
-
-  def __init__(self, url, page_set):
-    super(SimpleScrollPage, self).__init__(url=url, page_set=page_set)
-
   def RunPageInteractions(self, action_runner):
     # Make the scroll longer to reduce noise.
     with action_runner.CreateGestureInteraction('ScrollAction'):
@@ -41,11 +36,13 @@ class SimpleMobileSitesPageSet(story.StorySet):
 
     scroll_page_list = [
       # Why: Scrolls moderately complex pages (up to 60 layers)
-      'http://www.ebay.co.uk/',
-      'https://www.flickr.com/',
-      'http://www.nyc.gov',
-      'http://m.nytimes.com/'
+      ('ebay_scroll', 'http://www.ebay.co.uk/'),
+      ('flickr_scroll', 'https://www.flickr.com/'),
+      ('nyc_gov_scroll', 'http://www.nyc.gov'),
+      ('nytimes_scroll', 'http://m.nytimes.com/')
     ]
 
-    for url in scroll_page_list:
-      self.AddStory(SimpleScrollPage(url, self))
+    for name,url in scroll_page_list:
+      self.AddStory(SimpleScrollPage(name=name,
+                                     url=url,
+                                     page_set=self))