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

Side by Side Diff: google_apis/gcm/engine/unregistration_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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <stdint.h> 5 #include <stdint.h>
6 #include <map> 6 #include <map>
7 #include <string> 7 #include <string>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 45
46 int max_retry_count() const { return max_retry_count_; } 46 int max_retry_count() const { return max_retry_count_; }
47 void set_max_retry_count(int max_retry_count) { 47 void set_max_retry_count(int max_retry_count) {
48 max_retry_count_ = max_retry_count; 48 max_retry_count_ = max_retry_count;
49 } 49 }
50 50
51 protected: 51 protected:
52 int max_retry_count_; 52 int max_retry_count_;
53 bool callback_called_; 53 bool callback_called_;
54 UnregistrationRequest::Status status_; 54 UnregistrationRequest::Status status_;
55 scoped_ptr<UnregistrationRequest> request_; 55 std::unique_ptr<UnregistrationRequest> request_;
56 FakeGCMStatsRecorder recorder_; 56 FakeGCMStatsRecorder recorder_;
57 }; 57 };
58 58
59 UnregistrationRequestTest::UnregistrationRequestTest() 59 UnregistrationRequestTest::UnregistrationRequestTest()
60 : max_retry_count_(kMaxRetries), 60 : max_retry_count_(kMaxRetries),
61 callback_called_(false), 61 callback_called_(false),
62 status_(UnregistrationRequest::UNREGISTRATION_STATUS_COUNT) {} 62 status_(UnregistrationRequest::UNREGISTRATION_STATUS_COUNT) {}
63 63
64 UnregistrationRequestTest::~UnregistrationRequestTest() {} 64 UnregistrationRequestTest::~UnregistrationRequestTest() {}
65 65
(...skipping 20 matching lines...) Expand all
86 86
87 GCMUnregistrationRequestTest::GCMUnregistrationRequestTest() { 87 GCMUnregistrationRequestTest::GCMUnregistrationRequestTest() {
88 } 88 }
89 89
90 GCMUnregistrationRequestTest::~GCMUnregistrationRequestTest() { 90 GCMUnregistrationRequestTest::~GCMUnregistrationRequestTest() {
91 } 91 }
92 92
93 void GCMUnregistrationRequestTest::CreateRequest() { 93 void GCMUnregistrationRequestTest::CreateRequest() {
94 UnregistrationRequest::RequestInfo request_info( 94 UnregistrationRequest::RequestInfo request_info(
95 kAndroidId, kSecurityToken, kAppId); 95 kAndroidId, kSecurityToken, kAppId);
96 scoped_ptr<GCMUnregistrationRequestHandler> request_handler( 96 std::unique_ptr<GCMUnregistrationRequestHandler> request_handler(
97 new GCMUnregistrationRequestHandler(kAppId)); 97 new GCMUnregistrationRequestHandler(kAppId));
98 request_.reset(new UnregistrationRequest( 98 request_.reset(new UnregistrationRequest(
99 GURL(kRegistrationURL), request_info, std::move(request_handler), 99 GURL(kRegistrationURL), request_info, std::move(request_handler),
100 GetBackoffPolicy(), 100 GetBackoffPolicy(),
101 base::Bind(&UnregistrationRequestTest::UnregistrationCallback, 101 base::Bind(&UnregistrationRequestTest::UnregistrationCallback,
102 base::Unretained(this)), 102 base::Unretained(this)),
103 max_retry_count_, url_request_context_getter(), &recorder_, 103 max_retry_count_, url_request_context_getter(), &recorder_,
104 std::string())); 104 std::string()));
105 } 105 }
106 106
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after
334 334
335 InstaceIDDeleteTokenRequestTest::~InstaceIDDeleteTokenRequestTest() { 335 InstaceIDDeleteTokenRequestTest::~InstaceIDDeleteTokenRequestTest() {
336 } 336 }
337 337
338 void InstaceIDDeleteTokenRequestTest::CreateRequest( 338 void InstaceIDDeleteTokenRequestTest::CreateRequest(
339 const std::string& instance_id, 339 const std::string& instance_id,
340 const std::string& authorized_entity, 340 const std::string& authorized_entity,
341 const std::string& scope) { 341 const std::string& scope) {
342 UnregistrationRequest::RequestInfo request_info( 342 UnregistrationRequest::RequestInfo request_info(
343 kAndroidId, kSecurityToken, kAppId); 343 kAndroidId, kSecurityToken, kAppId);
344 scoped_ptr<InstanceIDDeleteTokenRequestHandler> request_handler( 344 std::unique_ptr<InstanceIDDeleteTokenRequestHandler> request_handler(
345 new InstanceIDDeleteTokenRequestHandler( 345 new InstanceIDDeleteTokenRequestHandler(instance_id, authorized_entity,
346 instance_id, authorized_entity, scope, kGCMVersion)); 346 scope, kGCMVersion));
347 request_.reset(new UnregistrationRequest( 347 request_.reset(new UnregistrationRequest(
348 GURL(kRegistrationURL), request_info, std::move(request_handler), 348 GURL(kRegistrationURL), request_info, std::move(request_handler),
349 GetBackoffPolicy(), 349 GetBackoffPolicy(),
350 base::Bind(&UnregistrationRequestTest::UnregistrationCallback, 350 base::Bind(&UnregistrationRequestTest::UnregistrationCallback,
351 base::Unretained(this)), 351 base::Unretained(this)),
352 max_retry_count(), url_request_context_getter(), &recorder_, 352 max_retry_count(), url_request_context_getter(), &recorder_,
353 std::string())); 353 std::string()));
354 } 354 }
355 355
356 TEST_F(InstaceIDDeleteTokenRequestTest, RequestDataPassedToFetcher) { 356 TEST_F(InstaceIDDeleteTokenRequestTest, RequestDataPassedToFetcher) {
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
449 request_->Start(); 449 request_->Start();
450 450
451 SetResponse(net::HTTP_OK, "Error=XXX"); 451 SetResponse(net::HTTP_OK, "Error=XXX");
452 CompleteFetch(); 452 CompleteFetch();
453 453
454 EXPECT_TRUE(callback_called_); 454 EXPECT_TRUE(callback_called_);
455 EXPECT_EQ(UnregistrationRequest::UNKNOWN_ERROR, status_); 455 EXPECT_EQ(UnregistrationRequest::UNKNOWN_ERROR, status_);
456 } 456 }
457 457
458 } // namespace gcm 458 } // namespace gcm
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698