Use sync Send overload

Author: MihaZupan

src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.AutoRedirect.cs

@@ -184,7 +184,7 @@ await LoopbackServer.CreateServerAsync(async (origServer, origUrl) =>
                 {
                     await LoopbackServer.CreateServerAsync(async (redirectServer, redirectUrl) =>
                     {
-                        Task<HttpResponseMessage> getResponseTask = client.GetAsync(origUrl);
+                        Task<HttpResponseMessage> getResponseTask = client.GetAsync(TestAsync, origUrl);
 
                         Task redirectTask = redirectServer.AcceptConnectionSendResponseAndCloseAsync();
 

src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTestBase.cs

@@ -261,5 +261,10 @@ public static Task<byte[]> GetByteArrayAsync(this HttpClient client, bool async,
             return client.GetByteArrayAsync(uri);
 #endif
         }
+
+        public static Task<HttpResponseMessage> GetAsync(this HttpClient client, bool async, Uri uri, HttpCompletionOption completionOption = default, CancellationToken cancellationToken = default)
+        {
+            return SendAsync(client, async, new HttpRequestMessage(HttpMethod.Get, uri), completionOption, cancellationToken);
+        }
     }
 }

src/libraries/Common/tests/System/Net/Http/HttpProtocolTests.cs

@@ -266,10 +266,7 @@ await LoopbackServer.CreateServerAsync(async (server, url) =>
             {
                 using (HttpClient client = CreateHttpClient())
                 {
-                    HttpRequestMessage request = new HttpRequestMessage(HttpMethod.Get, url);
-                    request.Version = HttpVersion.Version11;
-
-                    Task<HttpResponseMessage> getResponseTask = client.SendAsync(TestAsync, request);
+                    Task<HttpResponseMessage> getResponseTask = client.GetAsync(TestAsync, url);
 
                     await TestHelper.WhenAllCompletedOrAnyFailed(
                         getResponseTask,
@@ -360,10 +357,7 @@ await LoopbackServer.CreateServerAsync(async (server, url) =>
                     Task ignoredServerTask = server.AcceptConnectionSendCustomResponseAndCloseAsync(
                         responseString + "\r\nConnection: close\r\nContent-Length: 0\r\n\r\n");
 
-                    HttpRequestMessage request = new HttpRequestMessage(HttpMethod.Get, url);
-                    request.Version = HttpVersion.Version11;
-
-                    await Assert.ThrowsAsync<HttpRequestException>(() => client.SendAsync(TestAsync, request));
+                    await Assert.ThrowsAsync<HttpRequestException>(() => client.GetAsync(TestAsync, url));
                 }
             }, new LoopbackServer.Options { StreamWrapper = GetStream });
         }
@@ -459,10 +453,7 @@ await LoopbackServer.CreateClientAndServerAsync(async url =>
             {
                 using HttpClient client = CreateHttpClient();
 
-                HttpRequestMessage request = new HttpRequestMessage(HttpMethod.Get, url);
-                request.Version = HttpVersion.Version11;
-
-                using HttpResponseMessage response = await client.SendAsync(TestAsync, request)
+                using HttpResponseMessage response = await client.GetAsync(TestAsync, url)
                     .WaitAsync(TestHelper.PassingTestTimeout);
 
                 Assert.Equal(200, (int)response.StatusCode);

src/libraries/Common/tests/System/Net/Http/IdnaProtocolTests.cs

@@ -40,7 +40,7 @@ await LoopbackServer.CreateServerAsync(async (server, serverUrl) =>
 
                 using (HttpClient client = CreateHttpClient(handler))
                 {
-                    Task<HttpResponseMessage> getResponseTask = client.GetAsync(uri);
+                    Task<HttpResponseMessage> getResponseTask = client.GetAsync(TestAsync, uri);
                     Task<List<string>> serverTask = server.AcceptConnectionSendResponseAndCloseAsync();
 
                     await TestHelper.WhenAllCompletedOrAnyFailed(getResponseTask, serverTask);

src/libraries/System.Net.Http/tests/FunctionalTests/MetricsTest.cs

@@ -719,7 +719,7 @@ protected override void Dispose(bool disposing)
 
         protected Task<HttpResponseMessage> SendAsync(HttpMessageInvoker invoker, HttpRequestMessage request, CancellationToken cancellationToken = default) =>
             TestHttpMessageInvoker ?
-            invoker.SendAsync(request, cancellationToken) :
+            (TestAsync ? invoker.SendAsync(request, cancellationToken) : Task.Run(() => invoker.Send(request, cancellationToken))) :
             ((HttpClient)invoker).SendAsync(TestAsync, request, cancellationToken);
 
         protected HttpMessageInvoker CreateHttpMessageInvoker(HttpMessageHandler? handler = null) =>