diff --git a/samples/BUILD.gn b/samples/BUILD.gn
index 1bb15a3..748a2af 100644
--- a/samples/BUILD.gn
+++ b/samples/BUILD.gn
@@ -44,7 +44,11 @@
     "//third_party/pdfium",
     ":fx_lpng",
   ]
-  configs += [ ":pdfium_samples_config" ]
+  configs -= [ "//build/config/compiler:chromium_code" ]
+  configs += [
+    ":pdfium_samples_config",
+    "//build/config/compiler:no_chromium_code",
+  ]
 }
 
 static_library("fx_lpng") {
diff --git a/samples/image_diff_png.cc b/samples/image_diff_png.cc
index a54dc81..04c2591 100644
--- a/samples/image_diff_png.cc
+++ b/samples/image_diff_png.cc
@@ -219,6 +219,9 @@
         state->row_converter = &ConvertRGBtoBGRA;
         state->output_channels = 4;
         break;
+      default:
+        NOTREACHED();
+        break;
     }
   } else if (channels == 4) {
     switch (state->output_format) {
@@ -234,6 +237,9 @@
         state->row_converter = &ConvertBetweenBGRAandRGBA;
         state->output_channels = 4;
         break;
+      default:
+        NOTREACHED();
+        break;
     }
   } else {
     NOTREACHED();
@@ -562,6 +568,10 @@
         converter = ConvertBetweenBGRAandRGBA;
       }
       break;
+
+    default:
+      NOTREACHED();
+      return false;
   }
 
   // Row stride should be at least as long as the length of the data.