Moves the rest of the static methods out.

2 files changed, 6 insertions, 6 deletions

diff --git a/src/DotNetOpenAuth.Test/OAuth/AppendixScenarios.cs b/src/DotNetOpenAuth.Test/OAuth/AppendixScenarios.cs
index 88e461c..2d58b1d 100644
--- a/src/DotNetOpenAuth.Test/OAuth/AppendixScenarios.cs
+++ b/src/DotNetOpenAuth.Test/OAuth/AppendixScenarios.cs
@@ -67,23 +67,23 @@ namespace DotNetOpenAuth.Test.OAuth {
 						}
 					}
 				},
-				CoordinatorBase.Handle(serviceDescription.TemporaryCredentialsRequestEndpoint).By(
+				Handle(serviceDescription.TemporaryCredentialsRequestEndpoint).By(
 					async (request, ct) => {
 						var requestTokenMessage = await sp.ReadTokenRequestAsync(request, ct);
 						return await sp.Channel.PrepareResponseAsync(sp.PrepareUnauthorizedTokenMessage(requestTokenMessage));
 					}),
-				CoordinatorBase.Handle(serviceDescription.ResourceOwnerAuthorizationEndpoint).By(
+				Handle(serviceDescription.ResourceOwnerAuthorizationEndpoint).By(
 					async (request, ct) => {
 						var authRequest = await sp.ReadAuthorizationRequestAsync(request, ct);
 						((InMemoryTokenManager)sp.TokenManager).AuthorizeRequestToken(authRequest.RequestToken);
 						return await sp.Channel.PrepareResponseAsync(sp.PrepareAuthorizationResponse(authRequest));
 					}),
-				CoordinatorBase.Handle(serviceDescription.TokenRequestEndpoint).By(
+				Handle(serviceDescription.TokenRequestEndpoint).By(
 					async (request, ct) => {
 						var accessRequest = await sp.ReadAccessTokenRequestAsync(request, ct);
 						return await sp.Channel.PrepareResponseAsync(sp.PrepareAccessTokenMessage(accessRequest), ct);
 					}),
-				CoordinatorBase.Handle(accessPhotoEndpoint).By(
+				Handle(accessPhotoEndpoint).By(
 					async (request, ct) => {
 						string accessToken = (await sp.ReadProtectedResourceAuthorizationAsync(request)).AccessToken;
 						Assert.That(accessToken, Is.Not.Null.And.Not.Empty);
diff --git a/src/DotNetOpenAuth.Test/OAuth/ChannelElements/OAuthChannelTests.cs b/src/DotNetOpenAuth.Test/OAuth/ChannelElements/OAuthChannelTests.cs
index d2059d9..a1db784 100644
--- a/src/DotNetOpenAuth.Test/OAuth/ChannelElements/OAuthChannelTests.cs
+++ b/src/DotNetOpenAuth.Test/OAuth/ChannelElements/OAuthChannelTests.cs
@@ -301,7 +301,7 @@ namespace DotNetOpenAuth.Test.OAuth.ChannelElements {
 				HttpMethods = scheme,
 			};
 
-			await CoordinatorBase.RunAsync(
+			await RunAsync(
 				async (hostFactories, CancellationToken) => {
 					IProtocolMessage response = await this.channel.RequestAsync(request, CancellationToken.None);
 					Assert.IsNotNull(response);
@@ -311,7 +311,7 @@ namespace DotNetOpenAuth.Test.OAuth.ChannelElements {
 					Assert.AreEqual(request.Name, responseMessage.Name);
 					Assert.AreEqual(request.Location, responseMessage.Location);
 				},
-				CoordinatorBase.Handle(request.Location).By(async (req, ct) => {
+				Handle(request.Location).By(async (req, ct) => {
 					Assert.IsNotNull(req);
 					Assert.AreEqual(MessagingUtilities.GetHttpVerb(scheme), req.Method);
 					var incomingMessage = (await this.channel.ReadFromRequestAsync(req, CancellationToken.None)) as TestMessage;