Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(667)

Unified Diff: google_apis/gaia/oauth2_token_service_request_unittest.cc

Issue 1873663002: Convert //google_apis from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: google_apis/gaia/oauth2_token_service_request_unittest.cc
diff --git a/google_apis/gaia/oauth2_token_service_request_unittest.cc b/google_apis/gaia/oauth2_token_service_request_unittest.cc
index d514f93bb7fb3cf9d83dde0ecf9a89bcf48644f9..6703508f1a9b55e3ee0659a59f211e75ab5e4ecc 100644
--- a/google_apis/gaia/oauth2_token_service_request_unittest.cc
+++ b/google_apis/gaia/oauth2_token_service_request_unittest.cc
@@ -170,7 +170,7 @@ class OAuth2TokenServiceRequestTest : public testing::Test {
base::MessageLoop ui_loop_;
OAuth2TokenService::ScopeSet scopes_;
- scoped_ptr<MockOAuth2TokenService> oauth2_service_;
+ std::unique_ptr<MockOAuth2TokenService> oauth2_service_;
scoped_refptr<OAuth2TokenServiceRequest::TokenServiceProvider> provider_;
TestingOAuth2TokenServiceConsumer consumer_;
};
@@ -211,9 +211,9 @@ TEST_F(OAuth2TokenServiceRequestTest, CreateAndStart_Failure) {
GoogleServiceAuthError(GoogleServiceAuthError::SERVICE_UNAVAILABLE),
std::string(),
base::Time());
- scoped_ptr<OAuth2TokenServiceRequest> request(
- OAuth2TokenServiceRequest::CreateAndStart(
- provider_.get(), kAccountId, scopes_, &consumer_));
+ std::unique_ptr<OAuth2TokenServiceRequest> request(
+ OAuth2TokenServiceRequest::CreateAndStart(provider_.get(), kAccountId,
+ scopes_, &consumer_));
ui_loop_.RunUntilIdle();
EXPECT_EQ(0, consumer_.num_get_token_success_);
EXPECT_EQ(1, consumer_.num_get_token_failure_);
@@ -223,9 +223,9 @@ TEST_F(OAuth2TokenServiceRequestTest, CreateAndStart_Failure) {
}
TEST_F(OAuth2TokenServiceRequestTest, CreateAndStart_Success) {
- scoped_ptr<OAuth2TokenServiceRequest> request(
- OAuth2TokenServiceRequest::CreateAndStart(
- provider_.get(), kAccountId, scopes_, &consumer_));
+ std::unique_ptr<OAuth2TokenServiceRequest> request(
+ OAuth2TokenServiceRequest::CreateAndStart(provider_.get(), kAccountId,
+ scopes_, &consumer_));
ui_loop_.RunUntilIdle();
EXPECT_EQ(1, consumer_.num_get_token_success_);
EXPECT_EQ(0, consumer_.num_get_token_failure_);
@@ -235,9 +235,9 @@ TEST_F(OAuth2TokenServiceRequestTest, CreateAndStart_Success) {
TEST_F(OAuth2TokenServiceRequestTest,
CreateAndStart_DestroyRequestBeforeCompletes) {
- scoped_ptr<OAuth2TokenServiceRequest> request(
- OAuth2TokenServiceRequest::CreateAndStart(
- provider_.get(), kAccountId, scopes_, &consumer_));
+ std::unique_ptr<OAuth2TokenServiceRequest> request(
+ OAuth2TokenServiceRequest::CreateAndStart(provider_.get(), kAccountId,
+ scopes_, &consumer_));
request.reset();
ui_loop_.RunUntilIdle();
EXPECT_EQ(0, consumer_.num_get_token_success_);
@@ -247,9 +247,9 @@ TEST_F(OAuth2TokenServiceRequestTest,
TEST_F(OAuth2TokenServiceRequestTest,
CreateAndStart_DestroyRequestAfterCompletes) {
- scoped_ptr<OAuth2TokenServiceRequest> request(
- OAuth2TokenServiceRequest::CreateAndStart(
- provider_.get(), kAccountId, scopes_, &consumer_));
+ std::unique_ptr<OAuth2TokenServiceRequest> request(
+ OAuth2TokenServiceRequest::CreateAndStart(provider_.get(), kAccountId,
+ scopes_, &consumer_));
ui_loop_.RunUntilIdle();
request.reset();
EXPECT_EQ(1, consumer_.num_get_token_success_);

Powered by Google App Engine
This is Rietveld 408576698