--- a/mobile/android/chrome/geckoview/GeckoViewNavigationContent.js
+++ b/mobile/android/chrome/geckoview/GeckoViewNavigationContent.js
@@ -22,19 +22,18 @@ class GeckoViewNavigationContent extends
   onDisable() {
     debug `onDisable`;
 
     docShell.loadURIDelegate = null;
   }
 
   // nsILoadURIDelegate.
   loadURI(aUri, aWhere, aFlags, aTriggeringPrincipal) {
-    debug `loadURI: uri=${ aUri && aUri.spec
-                  } where=${ aWhere
-                  } flags=${ aFlags }`;
+    debug `loadURI: uri=${aUri && aUri.spec}
+                    where=${aWhere} flags=${aFlags}`;
 
     // TODO: Remove this when we have a sensible error API.
     if (aUri && aUri.displaySpec.startsWith("about:certerror")) {
       addEventListener("click", ErrorPageEventHandler, true);
     }
 
     return LoadURIDelegate.load(this.eventDispatcher, aUri, aWhere, aFlags,
                                 aTriggeringPrincipal);

--- a/mobile/android/components/geckoview/GeckoViewExternalAppService.js
+++ b/mobile/android/components/geckoview/GeckoViewExternalAppService.js
@@ -20,34 +20,34 @@ function ExternalAppService() {
 ExternalAppService.prototype = {
   classID: Components.ID("{a89eeec6-6608-42ee-a4f8-04d425992f45}"),
   QueryInterface: XPCOMUtils.generateQI([Ci.nsIExternalHelperAppService]),
 
   doContent(mimeType, request, context, forceSave) {
     const channel = request.QueryInterface(Ci.nsIChannel);
     const mm = context.QueryInterface(Ci.nsIDocShell).tabChild.messageManager;
 
-    debug `doContent: uri=${ channel.URI.displaySpec
-                    } contentType=${ channel.contentType }`;
+    debug `doContent: uri=${channel.URI.displaySpec}
+                      contentType=${channel.contentType}`;
 
     EventDispatcher.forMessageManager(mm).sendRequest({
       type: "GeckoView:ExternalResponse",
       uri: channel.URI.displaySpec,
       contentType: channel.contentType,
       contentLength: channel.contentLength,
       filename: channel.contentDispositionFilename
     });
 
     request.cancel(Cr.NS_ERROR_ABORT);
     Components.returnCode = Cr.NS_ERROR_ABORT;
   },
 
   applyDecodingForExtension(ext, encoding) {
-    debug `applyDecodingForExtension: extension=${ ext
-                                    } encoding=${ encoding }`;
+    debug `applyDecodingForExtension: extension=${ext}
+                                      encoding=${encoding}`;
 
     // This doesn't matter for us right now because
     // we shouldn't end up reading the stream.
     return true;
   }
 };
 
 this.NSGetFactory = XPCOMUtils.generateNSGetFactory([ExternalAppService]);

--- a/mobile/android/modules/geckoview/GeckoViewNavigation.jsm
+++ b/mobile/android/modules/geckoview/GeckoViewNavigation.jsm
@@ -115,19 +115,18 @@ class GeckoViewNavigation extends GeckoV
       };
 
       // This event is emitted from createBrowser() in geckoview.js
       Services.obs.addObserver(handler, "geckoview-window-created");
     });
   }
 
   handleNewSession(aUri, aOpener, aWhere, aFlags, aTriggeringPrincipal) {
-    debug `handleNewSession: uri=${ aUri && aUri.spec
-                           } where=${ aWhere
-                           } flags=${ aFlags }`;
+    debug `handleNewSession: uri=${aUri && aUri.spec}
+                             where=${aWhere} flags=${aFlags}`;
 
     if (!this.isRegistered) {
       return null;
     }
 
     const message = {
       type: "GeckoView:OnNewSession",
       uri: aUri ? aUri.displaySpec : ""
@@ -145,19 +144,18 @@ class GeckoViewNavigation extends GeckoV
 
     // Wait indefinitely for app to respond with a browser or null
     Services.tm.spinEventLoopUntil(() => browser !== undefined);
     return browser;
   }
 
   // nsIBrowserDOMWindow.
   createContentWindow(aUri, aOpener, aWhere, aFlags, aTriggeringPrincipal) {
-    debug `createContentWindow: uri=${ aUri && aUri.spec
-                              } where=${ aWhere
-                              } flags=${ aFlags }`;
+    debug `createContentWindow: uri=${aUri && aUri.spec}
+                                where=${aWhere} flags=${aFlags}`;
 
     if (LoadURIDelegate.load(this.eventDispatcher, aUri, aWhere, aFlags,
                              aTriggeringPrincipal)) {
       // The app has handled the load, abort open-window handling.
       Components.returnCode = Cr.NS_ERROR_ABORT;
       return null;
     }
 
@@ -169,22 +167,21 @@ class GeckoViewNavigation extends GeckoV
     }
 
     return browser.contentWindow;
   }
 
   // nsIBrowserDOMWindow.
   createContentWindowInFrame(aUri, aParams, aWhere, aFlags, aNextTabParentId,
                              aName) {
-    debug `createContentWindowInFrame: uri=${ aUri && aUri.spec
-                                     } params=${ aParams
-                                     } where=${ aWhere
-                                     } flags=${ aFlags
-                                     } nextTabParentId=${ aNextTabParentId
-                                     } name=${ aName }`;
+    debug `createContentWindowInFrame: uri=${aUri && aUri.spec}
+                                       params=${aParams} where=${aWhere}
+                                       flags=${aFlags}
+                                       nextTabParentId=${aNextTabParentId}
+                                       name=${aName}`;
 
     if (LoadURIDelegate.load(this.eventDispatcher, aUri, aWhere, aFlags, null)) {
       // The app has handled the load, abort open-window handling.
       Components.returnCode = Cr.NS_ERROR_ABORT;
       return null;
     }
 
     const browser = this.handleNewSession(aUri, null, aWhere, aFlags, null);
@@ -194,19 +191,18 @@ class GeckoViewNavigation extends GeckoV
     }
 
     browser.setAttribute("nextTabParentId", aNextTabParentId);
     return browser;
   }
 
   handleOpenUri(aUri, aOpener, aWhere, aFlags, aTriggeringPrincipal,
                 aNextTabParentId) {
-    debug `handleOpenUri: uri=${ aUri && aUri.spec
-                        } where=${ aWhere
-                        } flags=${ aFlags }`;
+    debug `handleOpenUri: uri=${aUri && aUri.spec}
+                          where=${aWhere} flags=${aFlags}`;
 
     if (LoadURIDelegate.load(this.eventDispatcher, aUri, aWhere, aFlags,
                              aTriggeringPrincipal)) {
       return null;
     }
 
     let browser = this.browser;
 

--- a/mobile/android/modules/geckoview/GeckoViewProgress.jsm
+++ b/mobile/android/modules/geckoview/GeckoViewProgress.jsm
@@ -209,19 +209,18 @@ class GeckoViewProgress extends GeckoVie
     const settings = this.settings;
     debug `onSettingsUpdate: ${settings}`;
 
     IdentityHandler.setUseTrackingProtection(!!settings.useTrackingProtection);
     IdentityHandler.setUsePrivateMode(!!settings.usePrivateMode);
   }
 
   onStateChange(aWebProgress, aRequest, aStateFlags, aStatus) {
-    debug `onStateChange: isTopLevel=${ aWebProgress.isTopLevel
-                       }, flags=${ aStateFlags
-                       }, status=${ aStatus }`;
+    debug `onStateChange: isTopLevel=${aWebProgress.isTopLevel},
+                          flags=${aStateFlags}, status=${aStatus}`;
 
     if (!aWebProgress.isTopLevel) {
       return;
     }
 
     const uriSpec = aRequest.QueryInterface(Ci.nsIChannel).URI.displaySpec;
     debug `onStateChange: uri=${uriSpec}`;
 
@@ -260,18 +259,18 @@ class GeckoViewProgress extends GeckoVie
       type: "GeckoView:SecurityChanged",
       identity: identity
     };
 
     this.eventDispatcher.sendRequest(message);
   }
 
   onLocationChange(aWebProgress, aRequest, aLocationURI, aFlags) {
-    debug `onLocationChange: location=${ aLocationURI.displaySpec
-                          }, flags=${ aFlags }`;
+    debug `onLocationChange: location=${aLocationURI.displaySpec},
+                             flags=${aFlags}`;
 
     this._hostChanged = true;
     if (aFlags & Ci.nsIWebProgressListener.LOCATION_CHANGE_ERROR_PAGE) {
       // We apparently don't get a STATE_STOP in onStateChange(), so emit PageStop here
       this.eventDispatcher.sendRequest({
         type: "GeckoView:PageStop",
         success: false
       });