Revert of [Telemetry] Remove logic of pulling out user_agent_type from page_set

telemetry/telemetry/page/shared_page_state.py

 # 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.
 
 import logging
 import os
 import sys
 
 from telemetry.core import exceptions
 from telemetry.core import util
@@ skipping 40 matching lines @@
         assert not 'trace' in finder_options.profiler, (
             'This is a Timeline Based Measurement benchmark. You cannot run it '
             'with trace profiler enabled. If you need trace data, tracing is '
             'always enabled in Timeline Based Measurement benchmarks and you '
             'can get the trace data by adding --output-format=json.')
       # This is to avoid the cyclic-import caused by timeline_based_page_test.
       from telemetry.web_perf import timeline_based_page_test
       self._test = timeline_based_page_test.TimelineBasedPageTest(test)
     else:
       self._test = test
-    _PrepareFinderOptions(finder_options, self._test, self._device_type)
+    device_type = self._device_type
+    # TODO(aiolos, nednguyen): Remove this logic of pulling out user_agent_type
+    # from story_set once all page_set are converted to story_set
+    # (crbug.com/439512).
+
+    def _IsPageSetInstance(s):
+      # This is needed to avoid importing telemetry.page.page_set which will
+      # cause cyclic import.
+      return 'PageSet' == s.__class__.__name__ or 'PageSet' in (
+          list(c.__name__ for c in s.__class__.__bases__))
+    if not device_type and _IsPageSetInstance(story_set):
+      device_type = story_set.user_agent_type
+    _PrepareFinderOptions(finder_options, self._test, device_type)
     self._browser = None
     self._finder_options = finder_options
     self._possible_browser = self._GetPossibleBrowser(
         self._test, finder_options)
 
     self._first_browser = True
     self._did_login_for_current_page = False
     self._previous_page = None
     self._current_page = None
     self._current_tab = None
@@ skipping 271 matching lines @@
 class SharedDesktopPageState(SharedPageState):
   _device_type = 'desktop'
 
 
 class SharedTabletPageState(SharedPageState):
   _device_type = 'tablet'
 
 
 class Shared10InchTabletPageState(SharedPageState):
   _device_type = 'tablet_10_inch'