Fixes for MemoryCacheHTTPServerTest.

tools/telemetry/telemetry/core/memory_cache_http_server_unittest.py

Index: tools/telemetry/telemetry/core/memory_cache_http_server_unittest.py
diff --git a/tools/telemetry/telemetry/core/memory_cache_http_server_unittest.py b/tools/telemetry/telemetry/core/memory_cache_http_server_unittest.py
index 191ddb15ad714315d2c156b62af10749f895777b..5fbe850b5b85a3961da2bd716861431856ae9871 100644
--- a/tools/telemetry/telemetry/core/memory_cache_http_server_unittest.py
+++ b/tools/telemetry/telemetry/core/memory_cache_http_server_unittest.py
@@ -3,58 +3,49 @@
 # found in the LICENSE file.
 
 import os
-import unittest
 
-from telemetry.core import browser_finder
 from telemetry.core import util
-from telemetry.unittest import options_for_unittests
+from telemetry.unittest import tab_test_case
 
 
-class MemoryCacheHTTPServerTest(unittest.TestCase):
-
+class MemoryCacheHTTPServerTest(tab_test_case.TabTestCase):
   def setUp(self):
-    self.test_file = 'bear.webm'
-    test_file_path = os.path.join(util.GetUnittestDataDir(), self.test_file)
-    self.test_file_size = os.stat(test_file_path).st_size
+    super(MemoryCacheHTTPServerTest, self).setUp()
+    self.test_file = os.path.join(util.GetUnittestDataDir(), 'bear.webm')
+    self.test_file_size = os.stat(self.test_file).st_size
 
   def testBasicHostingAndRangeRequests(self):
-    options = options_for_unittests.GetCopy()
-    browser_to_create = browser_finder.FindBrowser(options)
-    with browser_to_create.Create() as b:
-      b.SetHTTPServerDirectories(util.GetUnittestDataDir())
-      t = b.tabs[0]
-      t.Navigate(b.http_server.UrlOf('/blank.html'))
-      t.WaitForDocumentReadyStateToBeComplete()
-      x = t.EvaluateJavaScript('document.body.innerHTML')
-      x = x.strip()
+    self.Navigate('blank.html')
+    x = self._tab.EvaluateJavaScript('document.body.innerHTML')
+    x = x.strip()
 
-      # Test basic html hosting.
-      self.assertEquals(x, 'Hello world')
+    # Test basic html hosting.
+    self.assertEquals(x, 'Hello world')
 
-      file_size = self.test_file_size
-      last_byte = file_size - 1
-      # Test byte range request: no end byte.
-      self.CheckContentHeaders(b, t, '0-', '0-%d' % last_byte, file_size)
+    file_size = self.test_file_size
+    last_byte = file_size - 1
+    # Test byte range request: no end byte.
+    self.CheckContentHeaders('0-', '0-%d' % last_byte, file_size)
 
-      # Test byte range request: greater than zero start byte.
-      self.CheckContentHeaders(b, t, '100-', '100-%d' % last_byte,
-                               file_size - 100)
+    # Test byte range request: greater than zero start byte.
+    self.CheckContentHeaders('100-', '100-%d' % last_byte,
+                             file_size - 100)
 
-      # Test byte range request: explicit byte range.
-      self.CheckContentHeaders(b, t, '2-500', '2-500', '499')
+    # Test byte range request: explicit byte range.
+    self.CheckContentHeaders('2-500', '2-500', '499')
 
-      # Test byte range request: no start byte.
-      self.CheckContentHeaders(b, t, '-228',
-                               '%d-%d' % (file_size - 228, last_byte),
-                               '228')
+    # Test byte range request: no start byte.
+    self.CheckContentHeaders('-228',
+                             '%d-%d' % (file_size - 228, last_byte),
+                             '228')
 
-      # Test byte range request: end byte less than start byte.
-      self.CheckContentHeaders(b, t, '100-5', '100-%d' % last_byte,
-                               file_size - 100)
+    # Test byte range request: end byte less than start byte.
+    self.CheckContentHeaders('100-5', '100-%d' % last_byte,
+                             file_size - 100)
 
-  def CheckContentHeaders(self, browser, tab, content_range_request,
-                          content_range_response, content_lenght_response):
-    tab.ExecuteJavaScript("""
+  def CheckContentHeaders(self, content_range_request, content_range_response,
+                          content_length_response):
+    self._tab.ExecuteJavaScript("""
         var loaded = false;
         var xmlhttp = new XMLHttpRequest();
         xmlhttp.onload = function(e) {
@@ -64,14 +55,14 @@ class MemoryCacheHTTPServerTest(unittest.TestCase):
         xmlhttp.open('GET', "%s?t=" + Date.now(), true);
         xmlhttp.setRequestHeader('Range', 'bytes=%s');
         xmlhttp.send();
-    """ % (browser.http_server.UrlOf('/%s' % self.test_file),
+    """ % (self._browser.http_server.UrlOf(self.test_file),
            content_range_request))
-    tab.WaitForJavaScriptExpression('loaded', 5)
-    content_range = tab.EvaluateJavaScript(
+    self._tab.WaitForJavaScriptExpression('loaded', 5)
+    content_range = self._tab.EvaluateJavaScript(
         'xmlhttp.getResponseHeader("Content-Range");')
     content_range_response = 'bytes %s/%d' % (
         content_range_response, self.test_file_size)
     self.assertEquals(content_range, content_range_response)
-    content_length = tab.EvaluateJavaScript(
+    content_length = self._tab.EvaluateJavaScript(
         'xmlhttp.getResponseHeader("Content-Length");')
-    self.assertEquals(content_length, str(content_lenght_response))
+    self.assertEquals(content_length, str(content_length_response))