Commit 0b2ccb06 authored by David Van Cleve's avatar David Van Cleve Committed by Commit Bot

Resolve a couple final nits from prior CL

This resolves a couple final style comments on the previous change
https://crrev.com/c/2057009:
- renames a test helper class to be more descriptive
- adds a space after a class definition

R=csharrison

Change-Id: I08c6311f3a3b18aebb23d710cdb22284291620fa
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2068736
Commit-Queue: David Van Cleve <davidvc@chromium.org>
Auto-Submit: David Van Cleve <davidvc@chromium.org>
Reviewed-by: default avatarCharlie Harrison <csharrison@chromium.org>
Cr-Commit-Position: refs/heads/master@{#745114}
parent 4811c840
...@@ -65,12 +65,13 @@ GURL IssuerDotComKeyCommitmentPath() { ...@@ -65,12 +65,13 @@ GURL IssuerDotComKeyCommitmentPath() {
.Resolve(kTrustTokenKeyCommitmentWellKnownPath); .Resolve(kTrustTokenKeyCommitmentWellKnownPath);
} }
class Waiter { class CommitmentWaiter {
public: public:
base::OnceCallback<void(TrustTokenKeyCommitmentController::Status, base::OnceCallback<void(TrustTokenKeyCommitmentController::Status,
std::unique_ptr<TrustTokenKeyCommitmentResult>)> std::unique_ptr<TrustTokenKeyCommitmentResult>)>
Callback() { Callback() {
return base::BindOnce(&Waiter::OnComplete, base::Unretained(this)); return base::BindOnce(&CommitmentWaiter::OnComplete,
base::Unretained(this));
} }
std::pair<TrustTokenKeyCommitmentController::Status, std::pair<TrustTokenKeyCommitmentController::Status,
...@@ -95,6 +96,7 @@ class Waiter { ...@@ -95,6 +96,7 @@ class Waiter {
std::unique_ptr<TrustTokenKeyCommitmentResult> result_; std::unique_ptr<TrustTokenKeyCommitmentResult> result_;
base::RunLoop run_loop_; base::RunLoop run_loop_;
}; };
} // namespace } // namespace
// Use a fixture just to reduce the amount of boilerplate it takes to create an // Use a fixture just to reduce the amount of boilerplate it takes to create an
...@@ -188,7 +190,7 @@ TEST_F(TrustTokenKeyCommitmentControllerTest, NetworkError) { ...@@ -188,7 +190,7 @@ TEST_F(TrustTokenKeyCommitmentControllerTest, NetworkError) {
TrustTokenKeyCommitmentController::Status result_status; TrustTokenKeyCommitmentController::Status result_status;
std::unique_ptr<TrustTokenKeyCommitmentResult> result; std::unique_ptr<TrustTokenKeyCommitmentResult> result;
Waiter waiter; CommitmentWaiter waiter;
auto url_request = MakeURLRequest("https://issuer.com/"); auto url_request = MakeURLRequest("https://issuer.com/");
...@@ -213,7 +215,7 @@ TEST_F(TrustTokenKeyCommitmentControllerTest, NetworkSuccessParseFailure) { ...@@ -213,7 +215,7 @@ TEST_F(TrustTokenKeyCommitmentControllerTest, NetworkSuccessParseFailure) {
TrustTokenKeyCommitmentController::Status result_status; TrustTokenKeyCommitmentController::Status result_status;
std::unique_ptr<TrustTokenKeyCommitmentResult> result; std::unique_ptr<TrustTokenKeyCommitmentResult> result;
Waiter waiter; CommitmentWaiter waiter;
auto url_request = MakeURLRequest("https://issuer.com/"); auto url_request = MakeURLRequest("https://issuer.com/");
...@@ -245,7 +247,7 @@ TEST_F(TrustTokenKeyCommitmentControllerTest, Redirect) { ...@@ -245,7 +247,7 @@ TEST_F(TrustTokenKeyCommitmentControllerTest, Redirect) {
TrustTokenKeyCommitmentController::Status result_status; TrustTokenKeyCommitmentController::Status result_status;
std::unique_ptr<TrustTokenKeyCommitmentResult> result; std::unique_ptr<TrustTokenKeyCommitmentResult> result;
Waiter waiter; CommitmentWaiter waiter;
auto url_request = MakeURLRequest("https://issuer.com/"); auto url_request = MakeURLRequest("https://issuer.com/");
...@@ -268,7 +270,7 @@ TEST_F(TrustTokenKeyCommitmentControllerTest, Success) { ...@@ -268,7 +270,7 @@ TEST_F(TrustTokenKeyCommitmentControllerTest, Success) {
TrustTokenKeyCommitmentController::Status result_status; TrustTokenKeyCommitmentController::Status result_status;
std::unique_ptr<TrustTokenKeyCommitmentResult> result; std::unique_ptr<TrustTokenKeyCommitmentResult> result;
Waiter waiter; CommitmentWaiter waiter;
auto url_request = MakeURLRequest("https://issuer.com/"); auto url_request = MakeURLRequest("https://issuer.com/");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment