Revert 182991

tools/perf/perf_tools/skpicture_printer_unittest.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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 os
 import tempfile
 import shutil
 
+from telemetry import multi_page_benchmark_unittest_base
+from telemetry import options_for_unittests
 from perf_tools import skpicture_printer
-from telemetry.page import multi_page_benchmark_unittest_base
-from telemetry.test import options_for_unittests
 
 class SkPicturePrinterUnitTest(
   multi_page_benchmark_unittest_base.MultiPageBenchmarkUnitTestBase):
 
   def setUp(self):
     super(SkPicturePrinterUnitTest, self).setUp()
     self._outdir = tempfile.mkdtemp()
     self._options = options_for_unittests.GetCopy()
     self._options.outdir = self._outdir
 
@@ skipping 11 matching lines @@
     results0 = all_results.page_results[0]
 
     outdir = results0['output_path'].value
     self.assertTrue('non_scrollable_page_html' in outdir)
     self.assertTrue(os.path.isdir(outdir))
     self.assertEqual(['layer_0.skp'], os.listdir(outdir))
 
     skp_file = os.path.join(outdir, 'layer_0.skp')
     self.assertTrue(os.path.isfile(skp_file))
     self.assertTrue(os.path.getsize(skp_file) > 0)