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

telemetry/telemetry/page/cache_temperature.py

Index: telemetry/telemetry/page/cache_temperature.py
diff --git a/telemetry/telemetry/page/cache_temperature.py b/telemetry/telemetry/page/cache_temperature.py
index d4782793958f8e0c1a3b19703c9f9b106f8ed9b4..0c60457593937e710256b6c4057bcc4418a12804 100644
--- a/telemetry/telemetry/page/cache_temperature.py
+++ b/telemetry/telemetry/page/cache_temperature.py
@@ -31,22 +31,28 @@
     self.identifier = identifier
 
   def __enter__(self):
-    marker = 'telemetry.internal.%s.start' % self.identifier
-    self.browser.tabs[0].ExecuteJavaScript2(
-        "console.time({{ marker }});", marker=marker)
-    self.browser.tabs[0].ExecuteJavaScript2(
-        "console.timeEnd({{ marker }});", marker=marker)
+    # TODO(catapult:#3028): Fix interpolation of JavaScript values.
+    self.browser.tabs[0].ExecuteJavaScript(
+        """console.time('telemetry.internal.{0}.start');""".format(
+          self.identifier))
+    # TODO(catapult:#3028): Fix interpolation of JavaScript values.
+    self.browser.tabs[0].ExecuteJavaScript(
+        """console.timeEnd('telemetry.internal.{0}.start');""".format(
+          self.identifier))
     return self
 
   def __exit__(self, exception_type, exception_value, traceback):
     if exception_type:
       return True
 
-    marker = 'telemetry.internal.%s.start' % self.identifier
-    self.browser.tabs[0].ExecuteJavaScript2(
-        "console.time({{ marker }});", marker=marker)
-    self.browser.tabs[0].ExecuteJavaScript2(
-        "console.timeEnd({{ marker }});", marker=marker)
+    # TODO(catapult:#3028): Fix interpolation of JavaScript values.
+    self.browser.tabs[0].ExecuteJavaScript(
+        """console.time('telemetry.internal.{0}.end');""".format(
+          self.identifier))
+    # TODO(catapult:#3028): Fix interpolation of JavaScript values.
+    self.browser.tabs[0].ExecuteJavaScript(
+        """console.timeEnd('telemetry.internal.{0}.end');""".format(
+          self.identifier))
     return True
 
 def EnsurePageCacheTemperature(page, browser, previous_page=None):