Revert of [Telemetry] Switch clients to new JavaScript API (batch 5)

telemetry/telemetry/core/memory_cache_http_server_unittest.py

Index: telemetry/telemetry/core/memory_cache_http_server_unittest.py
diff --git a/telemetry/telemetry/core/memory_cache_http_server_unittest.py b/telemetry/telemetry/core/memory_cache_http_server_unittest.py
index d085733583c21513a6fb0d2d346dcdb2a219cade..d62ea2d8828157b12ec69b7ab331faaebcf22372 100644
--- a/telemetry/telemetry/core/memory_cache_http_server_unittest.py
+++ b/telemetry/telemetry/core/memory_cache_http_server_unittest.py
@@ -18,7 +18,7 @@
 
   def testBasicHostingAndRangeRequests(self):
     self.Navigate('blank.html')
-    x = self._tab.EvaluateJavaScript2('document.body.innerHTML')
+    x = self._tab.EvaluateJavaScript('document.body.innerHTML')
     x = x.strip()
 
     # Test basic html hosting.
@@ -44,26 +44,25 @@
 
   def CheckContentHeaders(self, content_range_request, content_range_response,
                           content_length_response):
-    self._tab.ExecuteJavaScript2("""
+    # TODO(catapult:#3028): Fix interpolation of JavaScript values.
+    self._tab.ExecuteJavaScript("""
         var loaded = false;
         var xmlhttp = new XMLHttpRequest();
         xmlhttp.onload = function(e) {
           loaded = true;
         };
         // Avoid cached content by appending unique URL param.
-        xmlhttp.open('GET', {{ url }} + "?t=" + Date.now(), true);
-        xmlhttp.setRequestHeader('Range', {{ range }});
+        xmlhttp.open('GET', "%s?t=" + Date.now(), true);
+        xmlhttp.setRequestHeader('Range', 'bytes=%s');
         xmlhttp.send();
-        """,
-        url=self.UrlOfUnittestFile(self._test_filename),
-        range='bytes=%s' % content_range_request)
-    self._tab.WaitForJavaScriptCondition2('loaded', timeout=5)
-    content_range = self._tab.EvaluateJavaScript2(
+    """ % (self.UrlOfUnittestFile(self._test_filename), content_range_request))
+    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 = self._tab.EvaluateJavaScript2(
+    content_length = self._tab.EvaluateJavaScript(
         'xmlhttp.getResponseHeader("Content-Length");')
     self.assertEquals(content_length, str(content_length_response))