[Telemetry] Port page cycler to Telemetry.

tools/telemetry/telemetry/page_set_url_builder_unittest.py

Index: tools/telemetry/telemetry/page_set_url_builder_unittest.py
diff --git a/tools/telemetry/telemetry/page_set_url_builder_unittest.py b/tools/telemetry/telemetry/page_set_url_builder_unittest.py
index 09ffbfeba4c4d069f1cbf183f3f1ea9e65646c52..7caddead68d427f38d0855bba96fb90da3056572 100644
--- a/tools/telemetry/telemetry/page_set_url_builder_unittest.py
+++ b/tools/telemetry/telemetry/page_set_url_builder_unittest.py
@@ -4,6 +4,7 @@
 import unittest
 import urlparse
 
+from telemetry import page
 from telemetry import page_set_url_builder
 
 class TestPageSetUrlBuilder(unittest.TestCase):
@@ -11,7 +12,7 @@ class TestPageSetUrlBuilder(unittest.TestCase):
     url = 'file:///somedir/otherdir/file.html'
     parsed_url = urlparse.urlparse(url)
     base_dir = 'basedir'
-    dirname, filename = page_set_url_builder.GetUrlBaseDirAndFile(base_dir,
+    dirname, filename = page_set_url_builder.GetUrlBaseDirAndFile({}, base_dir,
                                                                   parsed_url)
     self.assertEqual(dirname, 'basedir/somedir/otherdir')
     self.assertEqual(filename, 'file.html')
@@ -20,7 +21,18 @@ class TestPageSetUrlBuilder(unittest.TestCase):
     url = 'file:///../../otherdir/file.html'
     parsed_url = urlparse.urlparse(url)
     base_dir = 'basedir'
-    dirname, filename = page_set_url_builder.GetUrlBaseDirAndFile(base_dir,
+    dirname, filename = page_set_url_builder.GetUrlBaseDirAndFile({}, base_dir,
                                                                   parsed_url)
     self.assertEqual(dirname, 'basedir/../../otherdir')
     self.assertEqual(filename, 'file.html')
+
+  def testGetUrlBaseDirAndFileForUrlBaseDir(self):
+    url = 'file:///../../somedir/otherdir/file.html'
+    parsed_url = urlparse.urlparse(url)
+    base_dir = 'basedir'
+    apage = page.Page(url)
+    setattr(apage, 'url_base_dir', 'file:///../../somedir/')
+    dirname, filename = page_set_url_builder.GetUrlBaseDirAndFile(
+        apage, base_dir, parsed_url)
+    self.assertEqual(dirname, 'basedir/../../somedir/')
+    self.assertEqual(filename, 'otherdir/file.html')