[telemetry] Cleanups for benchmarks importing page sets.

tools/perf/profile_creators/extensions_profile_creator.py

 # Copyright 2013 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 json
 import logging
 import os
 import platform
 import shutil
 import socket
 import sys
 import tempfile
 import time
 import urllib2
 import zipfile
 
-from telemetry.core import util
-from telemetry.page import page_set
 from telemetry.page import profile_creator
 
+import page_sets
+
 
 def _ExternalExtensionsPath():
   """Returns the OS-dependent path at which to install the extension deployment
    files"""
   if platform.system() == 'Darwin':
     return os.path.join('/Library', 'Application Support', 'Google', 'Chrome',
         'External Extensions')
   elif platform.system() == 'Linux':
     return os.path.join('/opt', 'google', 'chrome', 'extensions' )
   else:
@@ skipping 47 matching lines @@
   """Virtual base class for profile creators that install extensions.
 
   Extensions are installed using the mechanism described in
   https://developer.chrome.com/extensions/external_extensions.html .
 
   Subclasses are meant to be run interactively.
   """
 
   def __init__(self):
     super(ExtensionsProfileCreator, self).__init__()
-    typical_25 = os.path.join(util.GetBaseDir(), 'page_sets', 'typical_25.py')
-    self._page_set = page_set.PageSet.FromFile(typical_25)
+    self._page_set = page_sets.Typical25()
 
     # Directory into which the output profile is written.
     self._output_profile_path = None
 
     # List of extensions to install.
     self._extensions_to_install = []
 
     # Theme to install (if any).
     self._theme_to_install = None
 
@@ skipping 115 matching lines @@
     if not self._extensions_installed:
       sleep_seconds = 5 * 60
       logging.info("Sleeping for %d seconds." % sleep_seconds)
       time.sleep(sleep_seconds)
       self._extensions_installed = True
     else:
       # Phase 2: Wait for tab to finish loading.
       for i in xrange(len(tab.browser.tabs)):
         t = tab.browser.tabs[i]
         t.WaitForDocumentReadyStateToBeComplete()