Telemetry support for iframes.

tools/telemetry/telemetry/core/backends/chrome/inspector_backend.py

Index: tools/telemetry/telemetry/core/backends/chrome/inspector_backend.py
diff --git a/tools/telemetry/telemetry/core/backends/chrome/inspector_backend.py b/tools/telemetry/telemetry/core/backends/chrome/inspector_backend.py
index e47e42156dfb448f632a1a7adf3922914f46126f..640c64f31d0daa6c10f2b0f3bef8f3e6c6cd3713 100644
--- a/tools/telemetry/telemetry/core/backends/chrome/inspector_backend.py
+++ b/tools/telemetry/telemetry/core/backends/chrome/inspector_backend.py
@@ -112,7 +112,7 @@ class InspectorBackend(object):
       # Displays other than 0 mean we are likely running in something like
       # xvfb where screenshotting doesn't work.
       return False
-    return not self._runtime.Evaluate("""
+    return not self.EvaluateJavaScript("""
         window.chrome.gpuBenchmarking === undefined ||
         window.chrome.gpuBenchmarking.beginWindowSnapshotPNG === undefined
       """)
@@ -120,7 +120,7 @@ class InspectorBackend(object):
   def Screenshot(self, timeout):
     assert self.screenshot_supported, 'Browser does not support screenshotting'
 
-    self._runtime.Evaluate("""
+    self.EvaluateJavaScript("""
         if(!window.__telemetry) {
           window.__telemetry = {}
         }
@@ -135,11 +135,12 @@ class InspectorBackend(object):
     """)
 
     def IsSnapshotComplete():
-      return self._runtime.Evaluate('window.__telemetry.snapshotComplete')
+      return self.EvaluateJavaScript(
+          'window.__telemetry.snapshotComplete')
 
     util.WaitFor(IsSnapshotComplete, timeout)
 
-    snap = self._runtime.Evaluate("""
+    snap = self.EvaluateJavaScript("""
       (function() {
         var data = window.__telemetry.snapshotData;
         delete window.__telemetry.snapshotComplete;
@@ -184,11 +185,11 @@ class InspectorBackend(object):
 
   # Runtime public methods.
 
-  def ExecuteJavaScript(self, expr, timeout):
-    self._runtime.Execute(expr, timeout)
+  def ExecuteJavaScript(self, expr, context_id=None, timeout=60):
+    self._runtime.Execute(expr, context_id, timeout)
 
-  def EvaluateJavaScript(self, expr, timeout):
-    return self._runtime.Evaluate(expr, timeout)
+  def EvaluateJavaScript(self, expr, context_id=None, timeout=60):
+    return self._runtime.Evaluate(expr, context_id, timeout)
 
   # Timeline public methods.