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

Side by Side Diff: google_apis/gcm/engine/registration_request_unittest.cc

Issue 1232193002: Replace MessageLoop::current() with ThreadTaskRunnerHandle::Get() in GCM (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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 <map> 5 #include <map>
6 #include <string> 6 #include <string>
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/strings/string_number_conversions.h" 9 #include "base/strings/string_number_conversions.h"
10 #include "base/strings/string_tokenizer.h" 10 #include "base/strings/string_tokenizer.h"
11 #include "base/test/test_simple_task_runner.h"
12 #include "base/thread_task_runner_handle.h"
11 #include "google_apis/gcm/engine/gcm_registration_request_handler.h" 13 #include "google_apis/gcm/engine/gcm_registration_request_handler.h"
12 #include "google_apis/gcm/engine/instance_id_get_token_request_handler.h" 14 #include "google_apis/gcm/engine/instance_id_get_token_request_handler.h"
13 #include "google_apis/gcm/monitoring/fake_gcm_stats_recorder.h" 15 #include "google_apis/gcm/monitoring/fake_gcm_stats_recorder.h"
14 #include "net/base/load_flags.h" 16 #include "net/base/load_flags.h"
15 #include "net/url_request/test_url_fetcher_factory.h" 17 #include "net/url_request/test_url_fetcher_factory.h"
16 #include "net/url_request/url_request_status.h" 18 #include "net/url_request/url_request_status.h"
17 #include "net/url_request/url_request_test_util.h" 19 #include "net/url_request/url_request_test_util.h"
18 #include "testing/gtest/include/gtest/gtest.h" 20 #include "testing/gtest/include/gtest/gtest.h"
19 21
20 namespace gcm { 22 namespace gcm {
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 max_retry_count_ = max_retry_count; 78 max_retry_count_ = max_retry_count;
77 } 79 }
78 80
79 protected: 81 protected:
80 int max_retry_count_; 82 int max_retry_count_;
81 RegistrationRequest::Status status_; 83 RegistrationRequest::Status status_;
82 std::string registration_id_; 84 std::string registration_id_;
83 bool callback_called_; 85 bool callback_called_;
84 std::map<std::string, std::string> extras_; 86 std::map<std::string, std::string> extras_;
85 scoped_ptr<RegistrationRequest> request_; 87 scoped_ptr<RegistrationRequest> request_;
86 base::MessageLoop message_loop_; 88 scoped_refptr<base::TestSimpleTaskRunner> task_runner_;
89 base::ThreadTaskRunnerHandle task_runner_handle_;
87 net::TestURLFetcherFactory url_fetcher_factory_; 90 net::TestURLFetcherFactory url_fetcher_factory_;
88 scoped_refptr<net::TestURLRequestContextGetter> url_request_context_getter_; 91 scoped_refptr<net::TestURLRequestContextGetter> url_request_context_getter_;
89 FakeGCMStatsRecorder recorder_; 92 FakeGCMStatsRecorder recorder_;
90 }; 93 };
91 94
92 RegistrationRequestTest::RegistrationRequestTest() 95 RegistrationRequestTest::RegistrationRequestTest()
93 : max_retry_count_(2), 96 : max_retry_count_(2),
94 status_(RegistrationRequest::SUCCESS), 97 status_(RegistrationRequest::SUCCESS),
95 callback_called_(false), 98 callback_called_(false),
99 task_runner_(new base::TestSimpleTaskRunner()),
100 task_runner_handle_(task_runner_),
96 url_request_context_getter_(new net::TestURLRequestContextGetter( 101 url_request_context_getter_(new net::TestURLRequestContextGetter(
97 message_loop_.task_runner())) {} 102 task_runner_)) {}
98 103
99 RegistrationRequestTest::~RegistrationRequestTest() {} 104 RegistrationRequestTest::~RegistrationRequestTest() {}
100 105
101 void RegistrationRequestTest::RegistrationCallback( 106 void RegistrationRequestTest::RegistrationCallback(
102 RegistrationRequest::Status status, 107 RegistrationRequest::Status status,
103 const std::string& registration_id) { 108 const std::string& registration_id) {
104 status_ = status; 109 status_ = status;
105 registration_id_ = registration_id; 110 registration_id_ = registration_id;
106 callback_called_ = true; 111 callback_called_ = true;
107 } 112 }
(...skipping 457 matching lines...) Expand 10 before | Expand all | Expand 10 after
565 570
566 SetResponseStatusAndString(net::HTTP_OK, "token=2501"); 571 SetResponseStatusAndString(net::HTTP_OK, "token=2501");
567 CompleteFetch(); 572 CompleteFetch();
568 573
569 EXPECT_TRUE(callback_called_); 574 EXPECT_TRUE(callback_called_);
570 EXPECT_EQ(RegistrationRequest::SUCCESS, status_); 575 EXPECT_EQ(RegistrationRequest::SUCCESS, status_);
571 EXPECT_EQ("2501", registration_id_); 576 EXPECT_EQ("2501", registration_id_);
572 } 577 }
573 578
574 } // namespace gcm 579 } // namespace gcm
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698