[polymer] Merge of master into polymer10-migration

telemetry/telemetry/internal/actions/swipe.js

Index: telemetry/telemetry/internal/actions/swipe.js
diff --git a/telemetry/telemetry/internal/actions/swipe.js b/telemetry/telemetry/internal/actions/swipe.js
index cf97d5cbbc9c43ad4b1bceecb311b2b95f8999fa..517485c22118f0b4bc5180980929f6ffb8c58559 100644
--- a/telemetry/telemetry/internal/actions/swipe.js
+++ b/telemetry/telemetry/internal/actions/swipe.js
@@ -26,15 +26,17 @@
   function supportedByBrowser() {
     return !!(window.chrome &&
               chrome.gpuBenchmarking &&
-              chrome.gpuBenchmarking.swipe);
+              chrome.gpuBenchmarking.swipe &&
+              chrome.gpuBenchmarking.visualViewportHeight &&
+              chrome.gpuBenchmarking.visualViewportWidth);
   }
 
   // This class swipes a page for a specified distance.
   function SwipeAction(opt_callback) {
     var self = this;
 
-    this.beginMeasuringHook = function() {}
-    this.endMeasuringHook = function() {}
+    this.beginMeasuringHook = function() {};
+    this.endMeasuringHook = function() {};
 
     this.callback_ = opt_callback;
   }