Revert of Enable traffic shaping in loading.mobile benchmark

tools/perf/page_sets/loading_mobile.py

 # Copyright 2016 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.
 
 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
 
 
 class LoadingMobileStorySet(story.StorySet):
 
   """ A collection of tests to measure loading performance of mobile sites.
 
   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',
       'https://www.youtube.com/watch?v=MU3YuvNRhVY',
       # pylint: disable=line-too-long
       'https://www.google.co.in/search?q=%E0%A4%AB%E0%A5%82%E0%A4%B2&rct=j#q=%E0%A4%AB%E0%A5%82%E0%A4%B2+%E0%A4%B5%E0%A4%BF%E0%A4%A4%E0%A4%B0%E0%A4%A3',
       'https://www.google.com.br/search?q=flor#q=Entrega+de+flores&start=10',
       # Disabled because of crbug.com/653775
       # pylint: disable=line-too-long
       # 'https://googleblog.blogspot.jp/2016/02/building-safer-web-for-everyone.html',
       'https://www.google.co.id/#q=pengiriman+bunga',
@@ skipping 17 matching lines @@
       'http://xw.qq.com/news/20160803025029/NEW2016080302502901',
       # pylint: disable=line-too-long
       'http://m.kaskus.co.id/thread/57a03a3214088d91068b4567/inilah-akibat-bersikap-overprotektif-terhadap-anak/?ref=homelanding&med=hot_thread',
       'http://www.dailymotion.com/video/x3d1kj5_fallout-4-review_videogames',
       'https://mobile.twitter.com/scottjehl/status/760618697727803394',
       'http://m.kapanlagi.com/lirik/artis/anji/kata_siapa/',
       # pylint: disable=line-too-long
       '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
       'https://www.flipkart.com/big-wing-casuals/p/itmemeageyfn6m9z?lid=LSTSHOEMEAGURG2PHPW18FTBN&pid=SHOEMEAGURG2PHPW',
       'https://smp.suumo.jp/mansion/tokyo/sc_104/cond/?moreCond=1',
       # Disabled because of crbug.com/653775
       # 'https://airhorner.com',
       'https://guitar-tuner.appspot.com',
       # Disabled because of crbug.com/653775
       # 'https://busrouter.sg',
       'https://andreasbovens.github.io/inbox-attack/',
       'https://voice-memos.appspot.com',
       # Disabled because of crbug.com/653775
       # 'https://wiki-offline.jakearchibald.com/',
       'https://dev.opera.com/',
       'https://www.pokedex.org/',
       'https://2048-opera-pwa.surge.sh/',
       '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',
       'http://www.dawn.com',
       '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',
       'http://www.bradesco.com.br',
       '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',
       'http://www.58pic.com',
       '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',
       'http://www.locanto.in',
       '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))