a8fd940 chore: address coderabbit cleanup suggestions · dumber

M README.md +1 -1


@@ -85,7 +85,7 @@ To use it on Arch:
85	85		sudo pacman -S cef
86	86		```
87	87
88		-	Dumber uses `/usr/lib/cef` by default when available. Override via:
	88	+	Dumber discovers CEF in the following order: `CEF_DIR` environment variable, `/usr/lib/cef`, or `~/.local/share/cef`. Override via:
89	89
90	90		```toml
91	91		[engine.cef]


@@ -85,7 +85,7 @@ To use it on Arch:
85		sudo pacman -S cef	85		sudo pacman -S cef
86		```	86		```
87			87
88	-	Dumber uses `/usr/lib/cef` by default when available. Override via:	88	+	Dumber discovers CEF in the following order: `CEF_DIR` environment variable, `/usr/lib/cef`, or `~/.local/share/cef`. Override via:
89			89
90		```toml	90		```toml
91		[engine.cef]	91		[engine.cef]

M internal/domain/url/startup.go +5 -2

@@ -1,5 +1,7 @@
1	1		package url
2	2
	3	+	import "strings"
	4	+
3	5		const defaultBrowserStartupURL = "dumb://history"
4	6
5	7		// DefaultBrowserStartupURL is the user-facing destination used when the browser

@@ -12,8 +14,9 @@ func DefaultBrowserStartupURL() string {
12	14		// ResolveBrowserStartupURL returns the explicit URL when provided, otherwise
13	15		// the global user-facing browser startup URL.
14	16		func ResolveBrowserStartupURL(rawURL string) string {
15		-	if rawURL != "" {
16		-	return rawURL
	17	+	trimmed := strings.TrimSpace(rawURL)
	18	+	if trimmed != "" {
	19	+	return trimmed
17	20		}
18	21		return defaultBrowserStartupURL
19	22		}

 package url
+import "strings"
 const defaultBrowserStartupURL = "dumb://history"
 // DefaultBrowserStartupURL is the user-facing destination used when the browser
 // ResolveBrowserStartupURL returns the explicit URL when provided, otherwise
 // the global user-facing browser startup URL.
 func ResolveBrowserStartupURL(rawURL string) string {
-	if rawURL != "" {
+	trimmed := strings.TrimSpace(rawURL)
-		return rawURL
+	if trimmed != "" {
+		return trimmed
 	}
 	return defaultBrowserStartupURL
 }

M internal/domain/url/startup_test.go +7 -0


@@ -16,6 +16,13 @@ func TestResolveBrowserStartupURL_DefaultsToHistory(t *testing.T) {
16	16		}
17	17		}
18	18
	19	+	func TestResolveBrowserStartupURL_WhitespaceOnlyDefaultsToHistory(t *testing.T) {
	20	+	got := ResolveBrowserStartupURL(" ")
	21	+	if got != "dumb://history" {
	22	+	t.Fatalf("expected default browser startup URL for whitespace-only input, got %q", got)
	23	+	}
	24	+	}
	25	+
19	26		func TestDefaultBrowserStartupURL(t *testing.T) {
20	27		got := DefaultBrowserStartupURL()
21	28		if got != "dumb://history" {


@@ -16,6 +16,13 @@ func TestResolveBrowserStartupURL_DefaultsToHistory(t *testing.T) {
16	}	16		}
17	}	17		}
18		18
		19	+	func TestResolveBrowserStartupURL_WhitespaceOnlyDefaultsToHistory(t *testing.T) {
		20	+	got := ResolveBrowserStartupURL(" ")
		21	+	if got != "dumb://history" {
		22	+	t.Fatalf("expected default browser startup URL for whitespace-only input, got %q", got)
		23	+	}
		24	+	}
		25	+
19	func TestDefaultBrowserStartupURL(t *testing.T) {	26		func TestDefaultBrowserStartupURL(t *testing.T) {
20	got := DefaultBrowserStartupURL()	27		got := DefaultBrowserStartupURL()
21	if got != "dumb://history" {	28		if got != "dumb://history" {

M internal/infrastructure/cef/engine_init.go +1 -4


@@ -82,7 +82,6 @@ func NewEngine(
82	82		return wireEngine(
83	83		ctx,
84	84		eng,
85		-	cfg,
86	85		windowlessFrameRate,
87	86		audioFactory,
88	87		logger,

@@ -162,7 +161,7 @@ func initializeCEF(eng Engine, settings purecef.Settings, logger zerolog.Logge
162	161
163	162		// wireEngine creates GL loader, factory, pool, and scheme handler after CEF init.
164	163		func wireEngine(
165		-	ctx context.Context, eng *Engine, _ RuntimeConfig,
	164	+	ctx context.Context, eng *Engine,
166	165		windowlessFrameRate int32, audioFactory port.AudioOutputFactory, logger *zerolog.Logger,
167	166		currentConfigPayload func() ([]byte, error), defaultConfigPayload func() ([]byte, error),
168	167		) (*Engine, error) {

@@ -199,7 +198,6 @@ func wireEngine(
199	198		return eng, nil
200	199		}
201	200
202		-
203	201		func newEngineSchemeHandler(
204	202		ctx context.Context,
205	203		eng *Engine,

@@ -281,7 +279,6 @@ func registerEngineSchemeFactory(
281	279		Msg("cef: registered internal https handler factory")
282	280		}
283	281
284		-
285	282		// getPrimaryMonitor returns the primary GDK monitor, or nil if unavailable.
286	283		func getPrimaryMonitor() *gdk.Monitor {
287	284		display := gdk.DisplayGetDefault()

 	return wireEngine(
 		ctx,
 		eng,
-		cfg,
 		windowlessFrameRate,
 		audioFactory,
 		logger,
 // wireEngine creates GL loader, factory, pool, and scheme handler after CEF init.
 func wireEngine(
-	ctx context.Context, eng *Engine, _ RuntimeConfig,
+	ctx context.Context, eng *Engine,
 	windowlessFrameRate int32, audioFactory port.AudioOutputFactory, logger *zerolog.Logger,
 	currentConfigPayload func() ([]byte, error), defaultConfigPayload func() ([]byte, error),
 ) (*Engine, error) {
 	return eng, nil
 }
 func newEngineSchemeHandler(
 	ctx context.Context,
 	eng *Engine,
 		Msg("cef: registered internal https handler factory")
 }
 // getPrimaryMonitor returns the primary GDK monitor, or nil if unavailable.
 func getPrimaryMonitor() *gdk.Monitor {
 	display := gdk.DisplayGetDefault()

M internal/infrastructure/cef/scheme_handler_test.go +32 -36


@@ -49,6 +49,20 @@ func (panicFaviconService) EnsureDiskCache(context.Context, string) {
49	49		}
50	50		func (panicFaviconService) Close() {}
51	51
	52	+	// noopConfigPayload returns a builder that always returns an empty JSON object.
	53	+	func noopConfigPayload() func() ([]byte, error) {
	54	+	return func() ([]byte, error) { return []byte(`{}`), nil }
	55	+	}
	56	+
	57	+	// newTestDumbSchemeHandler creates a dumbSchemeHandler with noop config payloads.
	58	+	// It calls t.Helper() and fails the test if construction errors.
	59	+	func newTestDumbSchemeHandler(t testing.T) dumbSchemeHandler {
	60	+	t.Helper()
	61	+	h, err := newDumbSchemeHandler(context.Background(), nil, noopConfigPayload(), noopConfigPayload())
	62	+	require.NoError(t, err)
	63	+	return h
	64	+	}
	65	+
52	66		func TestResolveConfigPayload_UsesInjectedBuilder(t *testing.T) {
53	67		data, err := resolveConfigPayload(func() ([]byte, error) {
54	68		return []byte(`{"engine_type":"cef"}`), nil

@@ -86,8 +100,7 @@ func TestNewDumbSchemeHandler_NilDefaultConfigPayloadFails(t *testing.T) {
86	100		}
87	101
88	102		func TestRejectForbiddenAPIOrigin_AllowsInternalOrigin(t *testing.T) {
89		-	h, err := newDumbSchemeHandler(context.Background(), nil, func() ([]byte, error) { return []byte(`{}`), nil }, func() ([]byte, error) { return []byte(`{}`), nil })
90		-	require.NoError(t, err)
	103	+	h := newTestDumbSchemeHandler(t)
91	104
92	105		request := cefmocks.NewMockRequest(t)
93	106		request.EXPECT().GetHeaderByName("Origin").Return(actualInternalOrigin).Once()

@@ -100,8 +113,7 @@ func TestRejectForbiddenAPIOrigin_RejectsExternalOrigin(t *testing.T) {
100	113		cefNewResourceHandler = func(impl purecef.ResourceHandler) purecef.ResourceHandler { return impl }
101	114		defer func() { cefNewResourceHandler = oldNewResourceHandler }()
102	115
103		-	h, err := newDumbSchemeHandler(context.Background(), nil, func() ([]byte, error) { return []byte(`{}`), nil }, func() ([]byte, error) { return []byte(`{}`), nil })
104		-	require.NoError(t, err)
	116	+	h := newTestDumbSchemeHandler(t)
105	117
106	118		request := cefmocks.NewMockRequest(t)
107	119		request.EXPECT().GetHeaderByName("Origin").Return("https://evil.example").Once()

@@ -124,8 +136,7 @@ func TestRejectUntrustedConfigRequesterRequiresTrustedOriginOrReferrer(t *testin
124	136		cefNewResourceHandler = func(impl purecef.ResourceHandler) purecef.ResourceHandler { return impl }
125	137		defer func() { cefNewResourceHandler = oldNewResourceHandler }()
126	138
127		-	h, err := newDumbSchemeHandler(context.Background(), nil, func() ([]byte, error) { return []byte(`{}`), nil }, func() ([]byte, error) { return []byte(`{}`), nil })
128		-	require.NoError(t, err)
	139	+	h := newTestDumbSchemeHandler(t)
129	140
130	141		trustedOrigin := cefmocks.NewMockRequest(t)
131	142		trustedOrigin.EXPECT().GetHeaderByName("Origin").Return(actualInternalOrigin).Once()

@@ -214,8 +225,7 @@ func TestHandleConfigAPIOptionsUsesPrivateNoCORSHeaders(t *testing.T) {
214	225		cefNewResourceHandler = func(impl purecef.ResourceHandler) purecef.ResourceHandler { return impl }
215	226		defer func() { cefNewResourceHandler = oldNewResourceHandler }()
216	227
217		-	h, err := newDumbSchemeHandler(context.Background(), nil, func() ([]byte, error) { return []byte(`{}`), nil }, func() ([]byte, error) { return []byte(`{}`), nil })
218		-	require.NoError(t, err)
	228	+	h := newTestDumbSchemeHandler(t)
219	229
220	230		request := cefmocks.NewMockRequest(t)
221	231		request.EXPECT().GetHeaderByName("Origin").Return(actualInternalOrigin).Once()

@@ -254,8 +264,7 @@ func TestIsTrustedSystemviewURL(t *testing.T) {
254	264		}
255	265
256	266		func TestRejectUntrustedFaviconRequesterAllowsTrustedOriginWithoutReferrer(t *testing.T) {
257		-	h, err := newDumbSchemeHandler(context.Background(), nil, func() ([]byte, error) { return []byte(`{}`), nil }, func() ([]byte, error) { return []byte(`{}`), nil })
258		-	require.NoError(t, err)
	267	+	h := newTestDumbSchemeHandler(t)
259	268
260	269		request := cefmocks.NewMockRequest(t)
261	270		request.EXPECT().GetHeaderByName("Origin").Return(actualInternalOrigin).Once()

@@ -268,8 +277,7 @@ func TestRejectUntrustedFaviconRequesterRejectsUntrustedOriginEvenWithTrustedRef
268	277		cefNewResourceHandler = func(impl purecef.ResourceHandler) purecef.ResourceHandler { return impl }
269	278		defer func() { cefNewResourceHandler = oldNewResourceHandler }()
270	279
271		-	h, err := newDumbSchemeHandler(context.Background(), nil, func() ([]byte, error) { return []byte(`{}`), nil }, func() ([]byte, error) { return []byte(`{}`), nil })
272		-	require.NoError(t, err)
	280	+	h := newTestDumbSchemeHandler(t)
273	281
274	282		request := cefmocks.NewMockRequest(t)
275	283		request.EXPECT().GetHeaderByName("Origin").Return("https://evil.example").Once()

@@ -282,8 +290,7 @@ func TestRejectUntrustedFaviconRequesterRequiresTrustedReferrerWhenOriginAbsent(
282	290		cefNewResourceHandler = func(impl purecef.ResourceHandler) purecef.ResourceHandler { return impl }
283	291		defer func() { cefNewResourceHandler = oldNewResourceHandler }()
284	292
285		-	h, err := newDumbSchemeHandler(context.Background(), nil, func() ([]byte, error) { return []byte(`{}`), nil }, func() ([]byte, error) { return []byte(`{}`), nil })
286		-	require.NoError(t, err)
	293	+	h := newTestDumbSchemeHandler(t)
287	294
288	295		trusted := cefmocks.NewMockRequest(t)
289	296		trusted.EXPECT().GetHeaderByName("Origin").Return("").Once()

@@ -302,8 +309,7 @@ func TestHandleFaviconAPIDefersFaviconDiskChecksUntilResourceOpen(t *testing.T)
302	309		cefNewResourceHandler = func(impl purecef.ResourceHandler) purecef.ResourceHandler { return impl }
303	310		defer func() { cefNewResourceHandler = oldNewResourceHandler }()
304	311
305		-	h, err := newDumbSchemeHandler(context.Background(), nil, func() ([]byte, error) { return []byte(`{}`), nil }, func() ([]byte, error) { return []byte(`{}`), nil })
306		-	require.NoError(t, err)
	312	+	h := newTestDumbSchemeHandler(t)
307	313		h.setFaviconService(panicFaviconService{})
308	314
309	315		request := cefmocks.NewMockRequest(t)

@@ -342,8 +348,7 @@ func TestSchemeHandler_APIClipboardSetPathWritesClipboardPayload(t *testing.T) {
342	348		cefNewResourceHandler = func(impl purecef.ResourceHandler) purecef.ResourceHandler { return impl }
343	349		defer func() { cefNewResourceHandler = oldNewResourceHandler }()
344	350
345		-	h, err := newDumbSchemeHandler(context.Background(), nil, func() ([]byte, error) { return []byte(`{}`), nil }, func() ([]byte, error) { return []byte(`{}`), nil })
346		-	require.NoError(t, err)
	351	+	h := newTestDumbSchemeHandler(t)
347	352
348	353		const bridgeNonce = "bridge-nonce"
349	354		browser := cefmocks.NewMockBrowser(t)

@@ -379,8 +384,7 @@ func TestSchemeHandler_APIFocusSyncRejectsRequestsWithoutTrustedBridgeHeader(t *
379	384		cefNewResourceHandler = func(impl purecef.ResourceHandler) purecef.ResourceHandler { return impl }
380	385		defer func() { cefNewResourceHandler = oldNewResourceHandler }()
381	386
382		-	h, err := newDumbSchemeHandler(context.Background(), nil, func() ([]byte, error) { return []byte(`{}`), nil }, func() ([]byte, error) { return []byte(`{}`), nil })
383		-	require.NoError(t, err)
	387	+	h := newTestDumbSchemeHandler(t)
384	388
385	389		request := cefmocks.NewMockRequest(t)
386	390		request.EXPECT().GetHeaderByName(dumberBridgeActionHeaderName).Return("").Once()

@@ -404,8 +408,7 @@ func TestSchemeHandler_APIFocusSyncInvokesEditableFocusCallback(t *testing.T) {
404	408		cefNewResourceHandler = func(impl purecef.ResourceHandler) purecef.ResourceHandler { return impl }
405	409		defer func() { cefNewResourceHandler = oldNewResourceHandler }()
406	410
407		-	h, err := newDumbSchemeHandler(context.Background(), nil, func() ([]byte, error) { return []byte(`{}`), nil }, func() ([]byte, error) { return []byte(`{}`), nil })
408		-	require.NoError(t, err)
	411	+	h := newTestDumbSchemeHandler(t)
409	412
410	413		const bridgeNonce = "bridge-nonce"
411	414		browser := cefmocks.NewMockBrowser(t)

@@ -440,8 +443,7 @@ func TestSchemeHandler_Create_ConceptualAPIRequestBypassesRedirect(t *testing.T)
440	443		cefNewResourceHandler = func(impl purecef.ResourceHandler) purecef.ResourceHandler { return impl }
441	444		defer func() { cefNewResourceHandler = oldNewResourceHandler }()
442	445
443		-	h, err := newDumbSchemeHandler(context.Background(), nil, func() ([]byte, error) { return []byte(`{}`), nil }, func() ([]byte, error) { return []byte(`{}`), nil })
444		-	require.NoError(t, err)
	446	+	h := newTestDumbSchemeHandler(t)
445	447
446	448		const bridgeNonce = "bridge-nonce"
447	449		browser := cefmocks.NewMockBrowser(t)

@@ -479,8 +481,7 @@ func TestSchemeHandler_APIClipboardSetRejectsInvalidBridgeNonce(t *testing.T) {
479	481		cefNewResourceHandler = func(impl purecef.ResourceHandler) purecef.ResourceHandler { return impl }
480	482		defer func() { cefNewResourceHandler = oldNewResourceHandler }()
481	483
482		-	h, err := newDumbSchemeHandler(context.Background(), nil, func() ([]byte, error) { return []byte(`{}`), nil }, func() ([]byte, error) { return []byte(`{}`), nil })
483		-	require.NoError(t, err)
	484	+	h := newTestDumbSchemeHandler(t)
484	485
485	486		browser := cefmocks.NewMockBrowser(t)
486	487		h.bridgeNonceValidator = func(_ purecef.Browser, _ string) bool { return false }

@@ -507,8 +508,7 @@ func TestSchemeHandler_APIPopupOpenInvokesPopupCallback(t *testing.T) {
507	508		cefNewResourceHandler = func(impl purecef.ResourceHandler) purecef.ResourceHandler { return impl }
508	509		defer func() { cefNewResourceHandler = oldNewResourceHandler }()
509	510
510		-	h, err := newDumbSchemeHandler(context.Background(), nil, func() ([]byte, error) { return []byte(`{}`), nil }, func() ([]byte, error) { return []byte(`{}`), nil })
511		-	require.NoError(t, err)
	511	+	h := newTestDumbSchemeHandler(t)
512	512
513	513		const bridgeNonce = "bridge-nonce"
514	514		browser := cefmocks.NewMockBrowser(t)

@@ -551,8 +551,7 @@ func TestSchemeHandler_APIPopupNavigateInvokesPopupCallback(t *testing.T) {
551	551		cefNewResourceHandler = func(impl purecef.ResourceHandler) purecef.ResourceHandler { return impl }
552	552		defer func() { cefNewResourceHandler = oldNewResourceHandler }()
553	553
554		-	h, err := newDumbSchemeHandler(context.Background(), nil, func() ([]byte, error) { return []byte(`{}`), nil }, func() ([]byte, error) { return []byte(`{}`), nil })
555		-	require.NoError(t, err)
	554	+	h := newTestDumbSchemeHandler(t)
556	555
557	556		const bridgeNonce = "bridge-nonce"
558	557		browser := cefmocks.NewMockBrowser(t)

@@ -592,8 +591,7 @@ func TestSchemeHandler_APIPopupCloseInvokesPopupCallback(t *testing.T) {
592	591		cefNewResourceHandler = func(impl purecef.ResourceHandler) purecef.ResourceHandler { return impl }
593	592		defer func() { cefNewResourceHandler = oldNewResourceHandler }()
594	593
595		-	h, err := newDumbSchemeHandler(context.Background(), nil, func() ([]byte, error) { return []byte(`{}`), nil }, func() ([]byte, error) { return []byte(`{}`), nil })
596		-	require.NoError(t, err)
	594	+	h := newTestDumbSchemeHandler(t)
597	595
598	596		const bridgeNonce = "bridge-nonce"
599	597		browser := cefmocks.NewMockBrowser(t)

@@ -690,8 +688,7 @@ func TestSchemeHandler_APIPopupBridgeRejectsInvalidPayloads(t *testing.T) {
690	688
691	689		for _, test := range tests {
692	690		t.Run(test.name, func(t *testing.T) {
693		-	h, err := newDumbSchemeHandler(context.Background(), nil, func() ([]byte, error) { return []byte(`{}`), nil }, func() ([]byte, error) { return []byte(`{}`), nil })
694		-	require.NoError(t, err)
	691	+	h := newTestDumbSchemeHandler(t)
695	692
696	693		const bridgeNonce = "bridge-nonce"
697	694		browser := cefmocks.NewMockBrowser(t)

@@ -729,8 +726,7 @@ func TestSchemeHandler_APIOptionsReturnsCORSPreflightHeaders(t *testing.T) {
729	726		cefNewResourceHandler = func(impl purecef.ResourceHandler) purecef.ResourceHandler { return impl }
730	727		defer func() { cefNewResourceHandler = oldNewResourceHandler }()
731	728
732		-	h, err := newDumbSchemeHandler(context.Background(), nil, func() ([]byte, error) { return []byte(`{}`), nil }, func() ([]byte, error) { return []byte(`{}`), nil })
733		-	require.NoError(t, err)
	729	+	h := newTestDumbSchemeHandler(t)
734	730
735	731		request := cefmocks.NewMockRequest(t)
736	732		response := cefmocks.NewMockResponse(t)

 }
 func (panicFaviconService) Close() {}
+// noopConfigPayload returns a builder that always returns an empty JSON object.
+func noopConfigPayload() func() ([]byte, error) {
+	return func() ([]byte, error) { return []byte(`{}`), nil }
+}
+// newTestDumbSchemeHandler creates a dumbSchemeHandler with noop config payloads.
+// It calls t.Helper() and fails the test if construction errors.
+func newTestDumbSchemeHandler(t *testing.T) *dumbSchemeHandler {
+	t.Helper()
+	h, err := newDumbSchemeHandler(context.Background(), nil, noopConfigPayload(), noopConfigPayload())
+	require.NoError(t, err)
+	return h
+}
 func TestResolveConfigPayload_UsesInjectedBuilder(t *testing.T) {
 	data, err := resolveConfigPayload(func() ([]byte, error) {
 		return []byte(`{"engine_type":"cef"}`), nil
 }
 func TestRejectForbiddenAPIOrigin_AllowsInternalOrigin(t *testing.T) {
-	h, err := newDumbSchemeHandler(context.Background(), nil, func() ([]byte, error) { return []byte(`{}`), nil }, func() ([]byte, error) { return []byte(`{}`), nil })
+	h := newTestDumbSchemeHandler(t)
-	require.NoError(t, err)
 	request := cefmocks.NewMockRequest(t)
 	request.EXPECT().GetHeaderByName("Origin").Return(actualInternalOrigin).Once()
 	cefNewResourceHandler = func(impl purecef.ResourceHandler) purecef.ResourceHandler { return impl }
 	defer func() { cefNewResourceHandler = oldNewResourceHandler }()
-	h, err := newDumbSchemeHandler(context.Background(), nil, func() ([]byte, error) { return []byte(`{}`), nil }, func() ([]byte, error) { return []byte(`{}`), nil })
+	h := newTestDumbSchemeHandler(t)
-	require.NoError(t, err)
 	request := cefmocks.NewMockRequest(t)
 	request.EXPECT().GetHeaderByName("Origin").Return("https://evil.example").Once()
 	cefNewResourceHandler = func(impl purecef.ResourceHandler) purecef.ResourceHandler { return impl }
 	defer func() { cefNewResourceHandler = oldNewResourceHandler }()
-	h, err := newDumbSchemeHandler(context.Background(), nil, func() ([]byte, error) { return []byte(`{}`), nil }, func() ([]byte, error) { return []byte(`{}`), nil })
+	h := newTestDumbSchemeHandler(t)
-	require.NoError(t, err)
 	trustedOrigin := cefmocks.NewMockRequest(t)
 	trustedOrigin.EXPECT().GetHeaderByName("Origin").Return(actualInternalOrigin).Once()
 	cefNewResourceHandler = func(impl purecef.ResourceHandler) purecef.ResourceHandler { return impl }
 	defer func() { cefNewResourceHandler = oldNewResourceHandler }()
-	h, err := newDumbSchemeHandler(context.Background(), nil, func() ([]byte, error) { return []byte(`{}`), nil }, func() ([]byte, error) { return []byte(`{}`), nil })
+	h := newTestDumbSchemeHandler(t)
-	require.NoError(t, err)
 	request := cefmocks.NewMockRequest(t)
 	request.EXPECT().GetHeaderByName("Origin").Return(actualInternalOrigin).Once()
 }
 func TestRejectUntrustedFaviconRequesterAllowsTrustedOriginWithoutReferrer(t *testing.T) {
-	h, err := newDumbSchemeHandler(context.Background(), nil, func() ([]byte, error) { return []byte(`{}`), nil }, func() ([]byte, error) { return []byte(`{}`), nil })
+	h := newTestDumbSchemeHandler(t)
-	require.NoError(t, err)
 	request := cefmocks.NewMockRequest(t)
 	request.EXPECT().GetHeaderByName("Origin").Return(actualInternalOrigin).Once()
 	cefNewResourceHandler = func(impl purecef.ResourceHandler) purecef.ResourceHandler { return impl }
 	defer func() { cefNewResourceHandler = oldNewResourceHandler }()
-	h, err := newDumbSchemeHandler(context.Background(), nil, func() ([]byte, error) { return []byte(`{}`), nil }, func() ([]byte, error) { return []byte(`{}`), nil })
+	h := newTestDumbSchemeHandler(t)
-	require.NoError(t, err)
 	request := cefmocks.NewMockRequest(t)
 	request.EXPECT().GetHeaderByName("Origin").Return("https://evil.example").Once()
 	cefNewResourceHandler = func(impl purecef.ResourceHandler) purecef.ResourceHandler { return impl }
 	defer func() { cefNewResourceHandler = oldNewResourceHandler }()
-	h, err := newDumbSchemeHandler(context.Background(), nil, func() ([]byte, error) { return []byte(`{}`), nil }, func() ([]byte, error) { return []byte(`{}`), nil })
+	h := newTestDumbSchemeHandler(t)
-	require.NoError(t, err)
 	trusted := cefmocks.NewMockRequest(t)
 	trusted.EXPECT().GetHeaderByName("Origin").Return("").Once()
 	cefNewResourceHandler = func(impl purecef.ResourceHandler) purecef.ResourceHandler { return impl }
 	defer func() { cefNewResourceHandler = oldNewResourceHandler }()
-	h, err := newDumbSchemeHandler(context.Background(), nil, func() ([]byte, error) { return []byte(`{}`), nil }, func() ([]byte, error) { return []byte(`{}`), nil })
+	h := newTestDumbSchemeHandler(t)
-	require.NoError(t, err)
 	h.setFaviconService(panicFaviconService{})
 	request := cefmocks.NewMockRequest(t)
 	cefNewResourceHandler = func(impl purecef.ResourceHandler) purecef.ResourceHandler { return impl }
 	defer func() { cefNewResourceHandler = oldNewResourceHandler }()
-	h, err := newDumbSchemeHandler(context.Background(), nil, func() ([]byte, error) { return []byte(`{}`), nil }, func() ([]byte, error) { return []byte(`{}`), nil })
+	h := newTestDumbSchemeHandler(t)
-	require.NoError(t, err)
 	const bridgeNonce = "bridge-nonce"
 	browser := cefmocks.NewMockBrowser(t)
 	cefNewResourceHandler = func(impl purecef.ResourceHandler) purecef.ResourceHandler { return impl }
 	defer func() { cefNewResourceHandler = oldNewResourceHandler }()
-	h, err := newDumbSchemeHandler(context.Background(), nil, func() ([]byte, error) { return []byte(`{}`), nil }, func() ([]byte, error) { return []byte(`{}`), nil })
+	h := newTestDumbSchemeHandler(t)
-	require.NoError(t, err)
 	request := cefmocks.NewMockRequest(t)
 	request.EXPECT().GetHeaderByName(dumberBridgeActionHeaderName).Return("").Once()
 	cefNewResourceHandler = func(impl purecef.ResourceHandler) purecef.ResourceHandler { return impl }
 	defer func() { cefNewResourceHandler = oldNewResourceHandler }()
-	h, err := newDumbSchemeHandler(context.Background(), nil, func() ([]byte, error) { return []byte(`{}`), nil }, func() ([]byte, error) { return []byte(`{}`), nil })
+	h := newTestDumbSchemeHandler(t)
-	require.NoError(t, err)
 	const bridgeNonce = "bridge-nonce"
 	browser := cefmocks.NewMockBrowser(t)
 	cefNewResourceHandler = func(impl purecef.ResourceHandler) purecef.ResourceHandler { return impl }
 	defer func() { cefNewResourceHandler = oldNewResourceHandler }()
-	h, err := newDumbSchemeHandler(context.Background(), nil, func() ([]byte, error) { return []byte(`{}`), nil }, func() ([]byte, error) { return []byte(`{}`), nil })
+	h := newTestDumbSchemeHandler(t)
-	require.NoError(t, err)
 	const bridgeNonce = "bridge-nonce"
 	browser := cefmocks.NewMockBrowser(t)
 	cefNewResourceHandler = func(impl purecef.ResourceHandler) purecef.ResourceHandler { return impl }
 	defer func() { cefNewResourceHandler = oldNewResourceHandler }()
-	h, err := newDumbSchemeHandler(context.Background(), nil, func() ([]byte, error) { return []byte(`{}`), nil }, func() ([]byte, error) { return []byte(`{}`), nil })
+	h := newTestDumbSchemeHandler(t)
-	require.NoError(t, err)
 	browser := cefmocks.NewMockBrowser(t)
 	h.bridgeNonceValidator = func(_ purecef.Browser, _ string) bool { return false }
 	cefNewResourceHandler = func(impl purecef.ResourceHandler) purecef.ResourceHandler { return impl }
 	defer func() { cefNewResourceHandler = oldNewResourceHandler }()
-	h, err := newDumbSchemeHandler(context.Background(), nil, func() ([]byte, error) { return []byte(`{}`), nil }, func() ([]byte, error) { return []byte(`{}`), nil })
+	h := newTestDumbSchemeHandler(t)
-	require.NoError(t, err)
 	const bridgeNonce = "bridge-nonce"
 	browser := cefmocks.NewMockBrowser(t)
 	cefNewResourceHandler = func(impl purecef.ResourceHandler) purecef.ResourceHandler { return impl }
 	defer func() { cefNewResourceHandler = oldNewResourceHandler }()
-	h, err := newDumbSchemeHandler(context.Background(), nil, func() ([]byte, error) { return []byte(`{}`), nil }, func() ([]byte, error) { return []byte(`{}`), nil })
+	h := newTestDumbSchemeHandler(t)
-	require.NoError(t, err)
 	const bridgeNonce = "bridge-nonce"
 	browser := cefmocks.NewMockBrowser(t)
 	cefNewResourceHandler = func(impl purecef.ResourceHandler) purecef.ResourceHandler { return impl }
 	defer func() { cefNewResourceHandler = oldNewResourceHandler }()
-	h, err := newDumbSchemeHandler(context.Background(), nil, func() ([]byte, error) { return []byte(`{}`), nil }, func() ([]byte, error) { return []byte(`{}`), nil })
+	h := newTestDumbSchemeHandler(t)
-	require.NoError(t, err)
 	const bridgeNonce = "bridge-nonce"
 	browser := cefmocks.NewMockBrowser(t)
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
-			h, err := newDumbSchemeHandler(context.Background(), nil, func() ([]byte, error) { return []byte(`{}`), nil }, func() ([]byte, error) { return []byte(`{}`), nil })
+			h := newTestDumbSchemeHandler(t)
-			require.NoError(t, err)
 			const bridgeNonce = "bridge-nonce"
 			browser := cefmocks.NewMockBrowser(t)
 	cefNewResourceHandler = func(impl purecef.ResourceHandler) purecef.ResourceHandler { return impl }
 	defer func() { cefNewResourceHandler = oldNewResourceHandler }()
-	h, err := newDumbSchemeHandler(context.Background(), nil, func() ([]byte, error) { return []byte(`{}`), nil }, func() ([]byte, error) { return []byte(`{}`), nil })
+	h := newTestDumbSchemeHandler(t)
-	require.NoError(t, err)
 	request := cefmocks.NewMockRequest(t)
 	response := cefmocks.NewMockResponse(t)