[polymer] Merge of master into polymer10-migration

telemetry/telemetry/internal/actions/pinch.js

Index: telemetry/telemetry/internal/actions/pinch.js
diff --git a/telemetry/telemetry/internal/actions/pinch.js b/telemetry/telemetry/internal/actions/pinch.js
index bdada3aa154695e306a269ebb5f086323d892584..4abb66e6431620ec2f4db92cefed3eb091bc2dee 100644
--- a/telemetry/telemetry/internal/actions/pinch.js
+++ b/telemetry/telemetry/internal/actions/pinch.js
@@ -29,7 +29,9 @@
   function supportedByBrowser() {
     return !!(window.chrome &&
               chrome.gpuBenchmarking &&
-              chrome.gpuBenchmarking.pinchBy);
+              chrome.gpuBenchmarking.pinchBy &&
+              chrome.gpuBenchmarking.visualViewportHeight &&
+              chrome.gpuBenchmarking.visualViewportWidth);
   }
 
   // This class zooms into or out of a page, given a number of pixels for
@@ -37,8 +39,8 @@
   function PinchAction(opt_callback) {
     var self = this;
 
-    this.beginMeasuringHook = function() {}
-    this.endMeasuringHook = function() {}
+    this.beginMeasuringHook = function() {};
+    this.endMeasuringHook = function() {};
 
     this.callback_ = opt_callback;
   };