12 files changed, 9 insertions, 28 deletions
diff --git a/src/win/graph/direct/brush.cpp b/src/win/graph/direct/brush.cpp
index b30d8c24..329ce509 100644
--- a/src/win/graph/direct/brush.cpp
+++ b/src/win/graph/direct/brush.cpp
@@ -4,8 +4,6 @@
 #include "cru/win/graph/direct/exception.hpp"
 #include "cru/win/graph/direct/factory.hpp"
 
-#include <cassert>
-
 namespace cru::platform::graph::win::direct {
 D2DSolidColorBrush::D2DSolidColorBrush(DirectGraphFactory* factory)
     : DirectGraphResource(factory) {
diff --git a/src/win/graph/direct/factory.cpp b/src/win/graph/direct/factory.cpp
index e67bdafe..0f4739ee 100644
--- a/src/win/graph/direct/factory.cpp
+++ b/src/win/graph/direct/factory.cpp
@@ -7,7 +7,6 @@
 #include "cru/win/graph/direct/geometry.hpp"
 #include "cru/win/graph/direct/text_layout.hpp"
 
-#include <cassert>
 #include <cstdlib>
 #include <utility>
 
diff --git a/src/win/graph/direct/font.cpp b/src/win/graph/direct/font.cpp
index 6bd43078..9b5eb477 100644
--- a/src/win/graph/direct/font.cpp
+++ b/src/win/graph/direct/font.cpp
@@ -5,7 +5,6 @@
 #include "cru/win/string.hpp"
 
 #include <array>
-#include <cassert>
 #include <utility>
 
 namespace cru::platform::graph::win::direct {
diff --git a/src/win/graph/direct/geometry.cpp b/src/win/graph/direct/geometry.cpp
index 5540edab..57b7f237 100644
--- a/src/win/graph/direct/geometry.cpp
+++ b/src/win/graph/direct/geometry.cpp
@@ -4,8 +4,6 @@
 #include "cru/win/graph/direct/exception.hpp"
 #include "cru/win/graph/direct/factory.hpp"
 
-#include <cassert>
-
 namespace cru::platform::graph::win::direct {
 D2DGeometryBuilder::D2DGeometryBuilder(DirectGraphFactory* factory)
     : DirectGraphResource(factory) {
diff --git a/src/win/graph/direct/painter.cpp b/src/win/graph/direct/painter.cpp
index fb2a6e7f..c5150ad4 100644
--- a/src/win/graph/direct/painter.cpp
+++ b/src/win/graph/direct/painter.cpp
@@ -7,12 +7,11 @@
 #include "cru/win/graph/direct/geometry.hpp"
 #include "cru/win/graph/direct/text_layout.hpp"
 
-#include <cassert>
 #include <type_traits>
 
 namespace cru::platform::graph::win::direct {
 D2DPainter::D2DPainter(ID2D1RenderTarget* render_target) {
-  assert(render_target);
+  Expects(render_target);
   render_target_ = render_target;
 }
 
diff --git a/src/win/graph/direct/resource.cpp b/src/win/graph/direct/resource.cpp
index 2acc91e4..c2be27ed 100644
--- a/src/win/graph/direct/resource.cpp
+++ b/src/win/graph/direct/resource.cpp
@@ -2,12 +2,10 @@
 
 #include "cru/win/graph/direct/factory.hpp"
 
-#include <cassert>
-
 namespace cru::platform::graph::win::direct {
 DirectGraphResource::DirectGraphResource(DirectGraphFactory* factory)
     : factory_(factory) {
-  assert(factory);
+  Expects(factory);
 }
 
 IGraphFactory* DirectGraphResource::GetGraphFactory() { return factory_; }
diff --git a/src/win/graph/direct/text_layout.cpp b/src/win/graph/direct/text_layout.cpp
index 59101163..6a6a2c45 100644
--- a/src/win/graph/direct/text_layout.cpp
+++ b/src/win/graph/direct/text_layout.cpp
@@ -7,7 +7,6 @@
 #include "cru/win/graph/direct/font.hpp"
 #include "cru/win/string.hpp"
 
-#include <cassert>
 #include <utility>
 
 namespace cru::platform::graph::win::direct {
@@ -18,7 +17,7 @@ DWriteTextLayout::DWriteTextLayout(DirectGraphFactory* factory,
                                    std::shared_ptr<IFont> font,
                                    std::string text)
     : DirectGraphResource(factory), text_(std::move(text)) {
-  assert(font);
+  Expects(font);
   font_ = CheckPlatform<DWriteFont>(font, GetPlatformId());
 
   w_text_ = cru::platform::win::ToUtf16String(text_);
diff --git a/src/win/native/ui_application.cpp b/src/win/native/ui_application.cpp
index 892acd50..80460b29 100644
--- a/src/win/native/ui_application.cpp
+++ b/src/win/native/ui_application.cpp
@@ -12,8 +12,6 @@
 #include "timer.hpp"
 #include "window_manager.hpp"
 
-#include <cassert>
-
 namespace cru::platform::native::win {
 WinUiApplication* WinUiApplication::instance = nullptr;
 
diff --git a/src/win/native/window.cpp b/src/win/native/window.cpp
index fea269d2..1b590026 100644
--- a/src/win/native/window.cpp
+++ b/src/win/native/window.cpp
@@ -15,7 +15,6 @@
 #include "window_manager.hpp"
 
 #include <windowsx.h>
-#include <cassert>
 
 namespace cru::platform::native::win {
 inline Point PiToDip(const POINT& pi_point) {
@@ -28,7 +27,7 @@ WinNativeWindow::WinNativeWindow(WinUiApplication* application,
     : application_(application),
       resolver_(std::make_shared<WinNativeWindowResolver>(this)),
       parent_window_(parent) {
-  assert(application);  // application can't be null.
+  Expects(application);  // application can't be null.
 
   if (parent != nullptr) {
     throw new std::runtime_error("Can't use a invalid window as parent.");
@@ -418,7 +417,7 @@ void WinNativeWindow::OnActivatedInternal() {}
 void WinNativeWindow::OnDeactivatedInternal() {}
 
 void WinNativeWindowResolver::Reset() {
-  assert(window_);  // already reset, can't reset again
+  Expects(window_);  // already reset, can't reset again
   window_ = nullptr;
 }
 }  // namespace cru::platform::native::win
diff --git a/src/win/native/window_d2d_painter.cpp b/src/win/native/window_d2d_painter.cpp
index 023559f4..54343fbf 100644
--- a/src/win/native/window_d2d_painter.cpp
+++ b/src/win/native/window_d2d_painter.cpp
@@ -4,8 +4,6 @@
 #include "cru/win/graph/direct/factory.hpp"
 #include "cru/win/native/window_render_target.hpp"
 
-#include <cassert>
-
 namespace cru::platform::native::win {
 using namespace cru::platform::graph::win::direct;
 
diff --git a/src/win/native/window_manager.cpp b/src/win/native/window_manager.cpp
index 0bf7656a..e1b14f4b 100644
--- a/src/win/native/window_manager.cpp
+++ b/src/win/native/window_manager.cpp
@@ -4,8 +4,6 @@
 #include "cru/win/native/window.hpp"
 #include "cru/win/native/window_class.hpp"
 
-#include <cassert>
-
 namespace cru::platform::native::win {
 LRESULT __stdcall GeneralWndProc(HWND hWnd, UINT Msg, WPARAM wParam,
                                  LPARAM lParam) {
@@ -31,13 +29,13 @@ WindowManager::~WindowManager() {
 }
 
 void WindowManager::RegisterWindow(HWND hwnd, WinNativeWindow* window) {
-  assert(window_map_.count(hwnd) == 0);  // The hwnd is already in the map.
+  Expects(window_map_.count(hwnd) == 0);  // The hwnd is already in the map.
   window_map_.emplace(hwnd, window);
 }
 
 void WindowManager::UnregisterWindow(HWND hwnd) {
   const auto find_result = window_map_.find(hwnd);
-  assert(find_result != window_map_.end());  // The hwnd is not in the map.
+  Expects(find_result != window_map_.end());  // The hwnd is not in the map.
   window_map_.erase(find_result);
   if (window_map_.empty()) application_->RequestQuit(0);
 }
diff --git a/src/win/native/window_render_target.cpp b/src/win/native/window_render_target.cpp
index 23ad2afa..eb6673c6 100644
--- a/src/win/native/window_render_target.cpp
+++ b/src/win/native/window_render_target.cpp
@@ -4,13 +4,11 @@
 #include "cru/win/graph/direct/factory.hpp"
 #include "dpi_util.hpp"
 
-#include <cassert>
-
 namespace cru::platform::native::win {
 using namespace cru::platform::graph::win::direct;
 WindowRenderTarget::WindowRenderTarget(DirectGraphFactory* factory, HWND hwnd)
     : factory_(factory) {
-  assert(factory);
+  Expects(factory);
 
   const auto d3d11_device = factory->GetD3D11Device();
   const auto dxgi_factory = factory->GetDxgiFactory();
@@ -56,7 +54,7 @@ void WindowRenderTarget::Present() {
 }
 
 void WindowRenderTarget::CreateTargetBitmap() {
-  assert(target_bitmap_ == nullptr);  // target bitmap must not exist.
+  Expects(target_bitmap_ == nullptr);  // target bitmap must not exist.
 
   // Direct2D needs the dxgi version of the backbuffer surface pointer.
   Microsoft::WRL::ComPtr<IDXGISurface> dxgi_back_buffer;