diff --git a/test/BUILD.gn b/test/BUILD.gn
index 911b616a1e..8da8e19c6a 100644
--- a/test/BUILD.gn
+++ b/test/BUILD.gn
@@ -597,18 +597,6 @@ rtc_source_set("test_common") {
   }
 }
 
-config("test_renderer_exported_config") {
-  if (is_win && is_clang) {
-    # GN orders flags on a target before flags from configs. The default config
-    # adds -Wall, and this flag have to be after -Wall -- so they need to
-    # come from a config and cannot be on the target directly.
-    cflags = [
-      "-Wno-bool-conversion",
-      "-Wno-delete-non-virtual-dtor",
-    ]
-  }
-}
-
 rtc_source_set("test_renderer") {
   public_deps = [
     ":test_renderer_generic",
@@ -696,8 +684,6 @@ rtc_source_set("test_renderer_generic") {
     ]
   }
 
-  public_configs = [ ":test_renderer_exported_config" ]
-
   if (!build_with_chromium && is_clang) {
     # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
     suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
diff --git a/test/win/d3d_renderer.cc b/test/win/d3d_renderer.cc
index 1f791a91ef..c0a65b56bb 100644
--- a/test/win/d3d_renderer.cc
+++ b/test/win/d3d_renderer.cc
@@ -148,13 +148,13 @@ D3dRenderer* D3dRenderer::Create(const char* window_title,
 
     wc_atom = RegisterClassA(&wc);
     if (wc_atom == 0)
-      return false;
+      return nullptr;
   }
 
   D3dRenderer* d3d_renderer = new D3dRenderer(width, height);
   if (!d3d_renderer->Init(window_title)) {
     delete d3d_renderer;
-    return NULL;
+    return nullptr;
   }
 
   return d3d_renderer;