[tools/perf] Fix JavaScript interpolation in action_runner calls

tools/perf/page_sets/google_pages.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 google_login
 
 from telemetry.page import page as page_module
 from telemetry.page import shared_page_state
 
 import os
@@ skipping 50 matching lines @@
 
 INTERACTION_NAME = 'Interaction.AppLoad'
 class AdwordCampaignDesktopPage(page_module.Page):
   def __init__(self, page_set):
     super(AdwordCampaignDesktopPage, self).__init__(
         url='https://adwords.google.com/cm/CampaignMgmt',
         page_set=page_set, name='AdwordsCampaign',
         credentials_path='data/credentials.json',
         shared_page_state_class=shared_page_state.SharedDesktopPageState)
     self.script_to_evaluate_on_commit = (
         'console.time("%s");' % INTERACTION_NAME)

[nednguyen, 2017/01/10 14:42:23]

also change it here for consistency?

[perezju, 2017/01/10 14:53:01]

Yup, thanks for pointing those out!

 
   def RunNavigateSteps(self, action_runner):
     google_login.LoginGoogleAccount(action_runner, 'google3',
                                     self.credentials_path)
     super(AdwordCampaignDesktopPage, self).RunNavigateSteps(action_runner)
 
   def RunPageInteractions(self, action_runner):
     action_runner.WaitForElement(text='Welcome to AdWords!')
-    # TODO(catapult:#3028): Fix interpolation of JavaScript values.
-    action_runner.ExecuteJavaScript('console.timeEnd("%s");' % INTERACTION_NAME)
+    action_runner.ExecuteJavaScript(
+        'console.timeEnd({{ label }});', label=INTERACTION_NAME)