DevTools: fix control flow in OverridesSupport.setDeviceMetricsOverride

Source/devtools/front_end/emulation/OverridesSupport.js

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 586 matching lines @@
             screenHeight = dipHeight + insets.top + insets.bottom;
             positionX = insets.left;
             positionY = insets.top;
         }
         this._deviceScale = scale;
 
         this._deviceMetricsThrottler.schedule(setDeviceMetricsOverride.bind(this));
 
         /**
          * @this {WebInspector.OverridesSupport}
-         * @return {!Promise.<undefined>}
+         * @return {!Promise.<?>}
          */
         function setDeviceMetricsOverride()
         {
-            var promise = this._target.emulationAgent().setDeviceMetricsOverride(
+            var setDevicePromise = this._target.emulationAgent().setDeviceMetricsOverride(
                 overrideWidth, overrideHeight, this.settings.emulateResolution.get() ? this.settings.deviceScaleFactor.get() : 0,
                 this.settings.emulateMobile.get(), this._pageResizer ? false : this.settings.deviceFitWindow.get(), scale, 0, 0,
                 screenWidth, screenHeight, positionX, positionY, apiCallback.bind(this))
+            var allPromises = [ setDevicePromise ];
             if (resetScrollAndPageScale)
-                this._target.emulationAgent().resetScrollAndPageScaleFactor();
-            return promise;
+                allPromises.push(this._target.emulationAgent().resetScrollAndPageScaleFactor());
+            return Promise.all(allPromises);
         }
 
         /**
          * @this {WebInspector.OverridesSupport}
-         * @return {!Promise.<undefined>}
+         * @return {!Promise.<?>}
          */
         function clearDeviceMetricsOverride()
         {
             return this._target.emulationAgent().clearDeviceMetricsOverride(apiCallback.bind(this))
         }
 
         /**
          * @param {?Protocol.Error} error
          * @this {WebInspector.OverridesSupport}
          */
@@ skipping 184 matching lines @@
     },
 
     __proto__: WebInspector.Object.prototype
 }
 
 
 /**
  * @type {!WebInspector.OverridesSupport}
  */
 WebInspector.overridesSupport;