Fixes for MemoryCacheHTTPServerTest.

tools/telemetry/telemetry/unittest/tab_test_case.py

Index: tools/telemetry/telemetry/unittest/tab_test_case.py
diff --git a/tools/telemetry/telemetry/unittest/tab_test_case.py b/tools/telemetry/telemetry/unittest/tab_test_case.py
index 1216f7a52443da078b69b3e654a123e09d43825d..0289026b3921c7a6f1968aed5c67a25befa20c54 100644
--- a/tools/telemetry/telemetry/unittest/tab_test_case.py
+++ b/tools/telemetry/telemetry/unittest/tab_test_case.py
@@ -1,10 +1,11 @@
 # 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 unittest
 
 from telemetry.core import browser_finder
-from telemetry.unittest import navigate_test
+from telemetry.core import util
 from telemetry.unittest import options_for_unittests
 
 class TabTestCase(unittest.TestCase):
@@ -50,5 +51,8 @@ class TabTestCase(unittest.TestCase):
 
     Also sets up http server to point to the unittest data directory.
     """
-    self.test_file_path = navigate_test.NavigateToTestFile(
-        self._tab, filename, script_to_evaluate_on_commit)
+    self._browser.SetHTTPServerDirectories(util.GetUnittestDataDir())
+    self.test_file_path = os.path.join(util.GetUnittestDataDir(), filename)
+    self._tab.Navigate(self._browser.http_server.UrlOf(self.test_file_path),
+                       script_to_evaluate_on_commit)
+    self._tab.WaitForDocumentReadyStateToBeComplete()