diff --git a/atom/browser/atom_browser_client.cc b/atom/browser/atom_browser_client.cc
index 6b3419272293..f116af0a667a 100644
--- a/atom/browser/atom_browser_client.cc
+++ b/atom/browser/atom_browser_client.cc
@@ -69,7 +69,8 @@ ProcessOwner GetProcessOwner(int process_id,
     return OWNER_NONE;
 
   // First search for NativeWindow.
-  if ((*window = NativeWindow::FromWebContents(web_contents)))
+  *window = NativeWindow::FromWebContents(web_contents);
+  if (window)
     return OWNER_NATIVE_WINDOW;
 
   // Then search for guest WebContents.
diff --git a/script/lib/config.py b/script/lib/config.py
index 7132b9d63bf5..9a5979bdbaef 100644
--- a/script/lib/config.py
+++ b/script/lib/config.py
@@ -8,7 +8,7 @@ import sys
 
 BASE_URL = os.getenv('LIBCHROMIUMCONTENT_MIRROR') or \
     'http://github-janky-artifacts.s3.amazonaws.com/libchromiumcontent'
-LIBCHROMIUMCONTENT_COMMIT = '21768a17f4f1203a50df5c0908b788fa2ecb96ab'
+LIBCHROMIUMCONTENT_COMMIT = 'e667b7cc5a04bc8e64960d47079d99446a263e85'
 
 PLATFORM = {
   'cygwin': 'win32',