[Telemetry refactor] Drop "2" from method calls to JS API

tools/perf/page_sets/login_helpers/google_login.py

 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 from page_sets.login_helpers import login_utils
 
 
 # JavaScript conditions which are true when the email and password inputs on
 # the Google Login page are visible respectively.
 _EMAIL_INPUT_VISIBLE_CONDITION = (
     'document.querySelector("#Email:not(.hidden)") !== null')
@@ skipping 25 matching lines @@
     for a detailed list of possible exceptions.
   """
   account_name, password = login_utils.GetAccountNameAndPassword(
       credential, credentials_path=credentials_path)
 
   action_runner.Navigate(
        'https://accounts.google.com/ServiceLogin?continue='
        'https%3A%2F%2Faccounts.google.com%2FManageAccount')
 
   # Wait until either the email or password input is visible.
-  action_runner.WaitForJavaScriptCondition2('{{ @a }} || {{ @b }}',
+  action_runner.WaitForJavaScriptCondition('{{ @a }} || {{ @b }}',
       a=_EMAIL_INPUT_VISIBLE_CONDITION, b=_PASSWORD_INPUT_VISIBLE_CONDITION)
 
   # If the email input is visible, this is the first Google login within the
   # browser session, so we must enter both email and password. Otherwise, only
   # password is required.
-  if action_runner.EvaluateJavaScript2(_EMAIL_INPUT_VISIBLE_CONDITION):
+  if action_runner.EvaluateJavaScript(_EMAIL_INPUT_VISIBLE_CONDITION):
     login_utils.InputForm(action_runner, account_name, input_id='Email',
                           form_id='gaia_firstform')
     action_runner.ClickElement(selector='#gaia_firstform #next')
 
   login_utils.InputForm(action_runner, password, input_id='Passwd')
   action_runner.ClickElement(selector='#signIn')
   action_runner.WaitForElement(text='My Account')