DevTools: promisify ContentProvider.requestContent and all its clients.

third_party/WebKit/Source/devtools/front_end/sources/ScriptFormatterEditorAction.js

 // Copyright 2014 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.
 
 /**
  * @constructor
  * @implements {WebInspector.DebuggerSourceMapping}
  * @param {!WebInspector.DebuggerModel} debuggerModel
  * @param {!WebInspector.ScriptFormatterEditorAction} editorAction
  */
@@ skipping 204 matching lines @@
             return false;
         var supportedProjectTypes = [WebInspector.projectTypes.Network, WebInspector.projectTypes.Debugger, WebInspector.projectTypes.ContentScripts];
         if (supportedProjectTypes.indexOf(uiSourceCode.project().type()) === -1)
             return false;
         return uiSourceCode.contentType().hasScripts();
     },
 
     _toggleFormatScriptSource: function()
     {
         var uiSourceCode = this._sourcesView.currentUISourceCode();
-        if (!this._isFormatableScript(uiSourceCode))
-            return;
-        this._formatUISourceCodeScript(uiSourceCode);
+        if (this._isFormatableScript(uiSourceCode))
+            this._formatUISourceCodeScript(uiSourceCode);
     },
 
     /**
      * @param {!WebInspector.UISourceCode} uiSourceCode
      * @param {!WebInspector.UISourceCode} formattedUISourceCode
      * @param {!WebInspector.FormatterSourceMapping} mapping
      * @private
      */
     _showIfNeeded: function(uiSourceCode, formattedUISourceCode, mapping)
     {
@@ skipping 104 matching lines @@
         var formattedPath = this._formattedPaths.get(uiSourceCode.project().id() + ":" + uiSourceCode.url());
         if (formattedPath) {
             var uiSourceCodePath = formattedPath;
             var formattedUISourceCode = this._workspace.uiSourceCode(this._projectId, uiSourceCodePath);
             var formatData = formattedUISourceCode ? this._formatData.get(formattedUISourceCode) : null;
             if (formatData)
                  this._showIfNeeded(uiSourceCode, /** @type {!WebInspector.UISourceCode} */ (formattedUISourceCode), formatData.mapping);
             return;
         }
 
-        uiSourceCode.requestContent(contentLoaded.bind(this));
+        uiSourceCode.requestContent().then(contentLoaded.bind(this));
 
         /**
          * @this {WebInspector.ScriptFormatterEditorAction}
          * @param {?string} content
          */
         function contentLoaded(content)
         {
             var highlighterType = WebInspector.NetworkProject.uiSourceCodeMimeType(uiSourceCode);
             WebInspector.Formatter.format(uiSourceCode.contentType(), highlighterType, content || "", innerCallback.bind(this));
         }
@@ skipping 22 matching lines @@
 
             var targets = WebInspector.targetManager.targets();
             for (var i = 0; i < targets.length; ++i) {
                 var scriptMapping = /** @type {!WebInspector.FormatterScriptMapping} */(this._scriptMappingByTarget.get(targets[i]));
                 WebInspector.debuggerWorkspaceBinding.setSourceMapping(targets[i], formattedUISourceCode, scriptMapping);
             }
             this._showIfNeeded(uiSourceCode, formattedUISourceCode, formatterMapping);
         }
     }
 }