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

telemetry/examples/browser_tests/simple_browser_test.py

Index: telemetry/examples/browser_tests/simple_browser_test.py
diff --git a/telemetry/examples/browser_tests/simple_browser_test.py b/telemetry/examples/browser_tests/simple_browser_test.py
index 572890386220f3fa15e21fd7d599675bac6fc42e..66819883c863e7cc1275d020c0ef00d65459e1f0 100644
--- a/telemetry/examples/browser_tests/simple_browser_test.py
+++ b/telemetry/examples/browser_tests/simple_browser_test.py
@@ -33,17 +33,17 @@
   def JavascriptTest(self, file_path, num_1, num_2, expected_sum):
     url = self.UrlOfStaticFilePath(file_path)
     self.action_runner.Navigate(url)
-    actual_sum = self.action_runner.EvaluateJavaScript2(
-        '{{ num_1 }} + {{ num_2 }}', num_1=num_1, num_2=num_2)
+    # TODO(catapult:#3028): Fix interpolation of JavaScript values.
+    actual_sum = self.action_runner.EvaluateJavaScript(
+        '%i + %i' % (num_1, num_2))
     self.assertEquals(expected_sum, actual_sum)
 
   def TestClickablePage(self):
     url = self.UrlOfStaticFilePath('page_with_clickables.html')
     self.action_runner.Navigate(url)
-    self.action_runner.ExecuteJavaScript2('valueSettableByTest = 1997')
+    self.action_runner.ExecuteJavaScript('valueSettableByTest = 1997')
     self.action_runner.ClickElement(text='Click/tap me')
-    self.assertEqual(
-        1997, self.action_runner.EvaluateJavaScript2('valueToTest'))
+    self.assertEqual(1997, self.action_runner.EvaluateJavaScript('valueToTest'))
 
   def TestAndroidUI(self):
     if self.platform.GetOSName() != 'android':
@@ -63,10 +63,9 @@
     self.action_runner.ClickElement('#id-0')
     # Verify that the page's js is interactable
     self.action_runner.WaitForElement(text='Click/tap me')
-    self.action_runner.ExecuteJavaScript2('valueSettableByTest = 1997')
+    self.action_runner.ExecuteJavaScript('valueSettableByTest = 1997')
     self.action_runner.ClickElement(text='Click/tap me')
-    self.assertEqual(
-        1997, self.action_runner.EvaluateJavaScript2('valueToTest'))
+    self.assertEqual(1997, self.action_runner.EvaluateJavaScript('valueToTest'))
 
 
 def load_tests(loader, tests, pattern):