diff --git a/DEPS b/DEPS
index ca676bb7..34313f8e 100644
--- a/DEPS
+++ b/DEPS
@@ -28,7 +28,7 @@ deps = {
       '01528c7244837168a1c80f06ff60fa5a9793c824',
   'crashpad/third_party/mini_chromium/mini_chromium':
       Var('chromium_git') + '/chromium/mini_chromium@' +
-      '8d42e2439aa0bd677dca64ba3070f3fa2353b7f2',
+      '8e12d3df2f1c0fcd84d649f4619323558db63a85',
 }
 
 hooks = [
diff --git a/build/crashpad.gypi b/build/crashpad.gypi
index 0dad63ca..027c7b68 100644
--- a/build/crashpad.gypi
+++ b/build/crashpad.gypi
@@ -20,4 +20,10 @@
     # build, this variable has no effect.
     'chromium_code': 1,
   },
+  'target_defaults': {
+    'msvs_disabled_warnings': [
+      4201,  # nonstandard extension used : nameless struct/union.
+      4324,  # structure was padded due to __declspec(align()).
+    ],
+  },
 }
diff --git a/client/simple_string_dictionary_test.cc b/client/simple_string_dictionary_test.cc
index 4619be74..6396c2fe 100644
--- a/client/simple_string_dictionary_test.cc
+++ b/client/simple_string_dictionary_test.cc
@@ -172,8 +172,10 @@ TEST(SimpleStringDictionary, Iterator) {
 
   int totalCount = 0;
 
-  const SimpleStringDictionary::Entry* entry;
-  while ((entry = iter.Next())) {
+  for (;;) {
+    const SimpleStringDictionary::Entry* entry = iter.Next();
+    if (!entry)
+      break;
     totalCount++;
 
     // Extract keyNumber from a string of the form key<keyNumber>
diff --git a/snapshot/win/process_reader_win.cc b/snapshot/win/process_reader_win.cc
index a1058886..373124d6 100644
--- a/snapshot/win/process_reader_win.cc
+++ b/snapshot/win/process_reader_win.cc
@@ -86,10 +86,13 @@ process_types::SYSTEM_PROCESS_INFORMATION<Traits>* GetProcessInformation(
       reinterpret_cast<process_types::SYSTEM_PROCESS_INFORMATION<Traits>*>(
           buffer->get());
   DWORD process_id = GetProcessId(process_handle);
-  do {
+  for (;;) {
     if (process->UniqueProcessId == process_id)
       return process;
-  } while (process = NextProcess(process));
+    process = NextProcess(process);
+    if (!process)
+      break;
+  }
 
   LOG(ERROR) << "process " << process_id << " not found";
   return nullptr;