cleanup: merge httpheader and httpfailure into model (#758)

These two small packages could easily be merged into the model
package, since they're clearly model-like packages.

Part of https://github.com/ooni/probe/issues/2115

internal/netxlite/dnsoverhttps.go

@@ -11,7 +11,6 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/ooni/probe-cli/v3/internal/engine/httpheader"
 	"github.com/ooni/probe-cli/v3/internal/model"
 )
 
@@ -55,7 +54,7 @@ func (t *DNSOverHTTPSTransport) RoundTrip(ctx context.Context, query []byte) ([]
 		return nil, err
 	}
 	req.Host = t.HostOverride
-	req.Header.Set("user-agent", httpheader.UserAgent())
+	req.Header.Set("user-agent", model.HTTPHeaderUserAgent)
 	req.Header.Set("content-type", "application/dns-message")
 	var resp *http.Response
 	resp, err = t.Client.Do(req.WithContext(ctx))

internal/netxlite/dnsoverhttps_test.go

@@ -9,7 +9,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/ooni/probe-cli/v3/internal/engine/httpheader"
+	"github.com/ooni/probe-cli/v3/internal/model"
 	"github.com/ooni/probe-cli/v3/internal/model/mocks"
 )
 
@@ -119,7 +119,7 @@ func TestDNSOverHTTPSTransport(t *testing.T) {
 			txp := &DNSOverHTTPSTransport{
 				Client: &mocks.HTTPClient{
 					MockDo: func(req *http.Request) (*http.Response, error) {
-						correct = req.Header.Get("User-Agent") == httpheader.UserAgent()
+						correct = req.Header.Get("User-Agent") == model.HTTPHeaderUserAgent
 						return nil, expected
 					},
 				},