Revert of Enable traffic shaping in loading.mobile benchmark

tools/perf/page_sets/loading_mobile.py

Index: tools/perf/page_sets/loading_mobile.py
diff --git a/tools/perf/page_sets/loading_mobile.py b/tools/perf/page_sets/loading_mobile.py
index c20019d5034d87f43b5cc08d6f6e3f6bce2ecdee..a4a92d0d15cb90d999a17d985282abbebfe0453b 100644
--- a/tools/perf/page_sets/loading_mobile.py
+++ b/tools/perf/page_sets/loading_mobile.py
@@ -5,7 +5,6 @@
 from page_sets import page_cycler_story
 from telemetry.page import cache_temperature as cache_temperature_module
 from telemetry.page import shared_page_state
-from telemetry.page import traffic_setting as traffic_setting_module
 from telemetry import story
 
 
@@ -16,16 +15,13 @@
   Design doc: https://docs.google.com/document/d/1QKlZIoURAxZk-brrXsKYZl9O8ieqXht3ogeF9yLNFCI/edit
   """
 
-  def __init__(self, cache_temperatures=None, traffic_settings=None):
+  def __init__(self, cache_temperatures=None):
     super(LoadingMobileStorySet, self).__init__(
         archive_data_file='data/loading_mobile.json',
         cloud_storage_bucket=story.PARTNER_BUCKET)
 
     if cache_temperatures is None:
       cache_temperatures = [cache_temperature_module.ANY]
-
-    if traffic_settings is None:
-      traffic_settings = [traffic_setting_module.NONE]
 
     self.AddStories(['global'], [
       'https://www.google.com/search?q=flower#q=flower+delivery',
@@ -64,7 +60,7 @@
       'http://olx.co.id/iklan/iphone-6s-64-rose-gold-warna-favorite-IDiSdm5.html#5310a118c3;promoted',
       # pylint: disable=line-too-long
       'http://enquiry.indianrail.gov.in/mntes/MntesServlet?action=MainMenu&subAction=excep&excpType=EC',
-    ], cache_temperatures, traffic_settings)
+    ], cache_temperatures)
 
     self.AddStories(['pwa'], [
       # pylint: disable=line-too-long
@@ -85,7 +81,7 @@
       'https://jakearchibald.github.io/trained-to-thrill/',
       'https://townwork.net',
       'https://flipboard.com/topic/yoga',
-    ], cache_temperatures, traffic_settings)
+    ], cache_temperatures)
 
     self.AddStories(['tough_ttfmp'], [
       'http://www.localmoxie.com',
@@ -93,7 +89,7 @@
       'http://www.thairath.co.th',
       'http://www.hashocean.com',
       'http://www.163.com',
-    ], cache_temperatures, traffic_settings)
+    ], cache_temperatures)
 
     self.AddStories(['easy_ttfmp'], [
       'http://www.slideshare.net',
@@ -101,7 +97,7 @@
       'http://www.gsshop.com',
       'http://www.sbs.co.kr',
       'http://www.futura-sciences.com',
-    ], cache_temperatures, traffic_settings)
+    ], cache_temperatures)
 
     self.AddStories(['tough_tti'], [
       'http://www.thestar.com.my',
@@ -109,7 +105,7 @@
       'http://www.hongkiat.com',
       'http://www.ebs.in',
       'http://www.ibicn.com',
-    ], cache_temperatures, traffic_settings)
+    ], cache_temperatures)
 
     self.AddStories(['easy_tti'], [
       'http://www.dramaq.com.tw',
@@ -117,12 +113,11 @@
       'http://www.francetvinfo.fr',
       'http://www.gfk.com',
       'http://www.mlsmatrix.com'
-    ], cache_temperatures, traffic_settings)
+    ], cache_temperatures)
 
-  def AddStories(self, labels, urls, cache_temperatures, traffic_settings):
+  def AddStories(self, labels, urls, cache_temperatures):
     for url in urls:
       for temp in cache_temperatures:
-        for traffic in traffic_settings:
-          self.AddStory(page_cycler_story.PageCyclerStory(url, self,
-              shared_page_state_class=shared_page_state.SharedMobilePageState,
-              cache_temperature=temp, traffic_setting=traffic, labels=labels))
+        self.AddStory(page_cycler_story.PageCyclerStory(url, self,
+            shared_page_state_class=shared_page_state.SharedMobilePageState,
+            cache_temperature=temp, labels=labels))