Bug 1032045 - Fix jshint errors via function inlining
Merge pull request #22439 from gyoshev/fix-1032045

Bug 1032045 - Fix jshint errors via function inlining r=@yurenju