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

telemetry/telemetry/page/page_run_end_to_end_unittest.py

Index: telemetry/telemetry/page/page_run_end_to_end_unittest.py
diff --git a/telemetry/telemetry/page/page_run_end_to_end_unittest.py b/telemetry/telemetry/page/page_run_end_to_end_unittest.py
index fabbfebab750d1f6d8559f6e755f8e78e92442ef..bed1caaeff3e288074f0965afa86fff169e30ded 100644
--- a/telemetry/telemetry/page/page_run_end_to_end_unittest.py
+++ b/telemetry/telemetry/page/page_run_end_to_end_unittest.py
@@ -283,8 +283,7 @@
     class TestUserAgent(legacy_page_test.LegacyPageTest):
       def ValidateAndMeasurePage(self, page, tab, results):
         del page, results  # unused
-        actual_user_agent = tab.EvaluateJavaScript2(
-            'window.navigator.userAgent')
+        actual_user_agent = tab.EvaluateJavaScript('window.navigator.userAgent')
         expected_user_agent = user_agent.UA_TYPE_MAPPING['tablet']
         assert actual_user_agent.strip() == expected_user_agent
 
@@ -631,7 +630,7 @@
     class TestWpr(legacy_page_test.LegacyPageTest):
       def ValidateAndMeasurePage(self, page, tab, results):
         del page, results  # unused
-        body.append(tab.EvaluateJavaScript2('document.body.innerText'))
+        body.append(tab.EvaluateJavaScript('document.body.innerText'))
 
       def DidRunPage(self, platform):
         # Force the replay server to restart between pages; this verifies that