| Index: chrome/browser/services/gcm/gcm_profile_service.cc
|
| diff --git a/chrome/browser/services/gcm/gcm_profile_service.cc b/chrome/browser/services/gcm/gcm_profile_service.cc
|
| index c215192c8df17f593250d6d4f9d6306a0d3b5f73..b9b1bd7ded30721db008756d62c16b2fabed1174 100644
|
| --- a/chrome/browser/services/gcm/gcm_profile_service.cc
|
| +++ b/chrome/browser/services/gcm/gcm_profile_service.cc
|
| @@ -267,8 +267,7 @@ class GCMProfileService::IOWorker
|
| void Load(const base::WeakPtr<GCMProfileService>& service);
|
| void CheckOut();
|
| void Register(const std::string& app_id,
|
| - const std::vector<std::string>& sender_ids,
|
| - const std::string& cert);
|
| + const std::vector<std::string>& sender_ids);
|
| void Unregister(const std::string& app_id);
|
| void Send(const std::string& app_id,
|
| const std::string& receiver_id,
|
| @@ -437,11 +436,10 @@ void GCMProfileService::IOWorker::CheckOut() {
|
|
|
| void GCMProfileService::IOWorker::Register(
|
| const std::string& app_id,
|
| - const std::vector<std::string>& sender_ids,
|
| - const std::string& cert) {
|
| + const std::vector<std::string>& sender_ids) {
|
| DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
|
|
|
| - gcm_client_->Register(app_id, cert, sender_ids);
|
| + gcm_client_->Register(app_id, sender_ids);
|
| }
|
|
|
| void GCMProfileService::IOWorker::Unregister(const std::string& app_id) {
|
| @@ -561,7 +559,6 @@ void GCMProfileService::Initialize(
|
|
|
| void GCMProfileService::Register(const std::string& app_id,
|
| const std::vector<std::string>& sender_ids,
|
| - const std::string& cert,
|
| RegisterCallback callback) {
|
| DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
|
| DCHECK(!app_id.empty() && !sender_ids.empty() && !callback.is_null());
|
| @@ -592,17 +589,15 @@ void GCMProfileService::Register(const std::string& app_id,
|
| base::Bind(&GCMProfileService::DoRegister,
|
| weak_ptr_factory_.GetWeakPtr(),
|
| app_id,
|
| - sender_ids,
|
| - cert));
|
| + sender_ids));
|
| return;
|
| }
|
|
|
| - DoRegister(app_id, sender_ids, cert);
|
| + DoRegister(app_id, sender_ids);
|
| }
|
|
|
| void GCMProfileService::DoRegister(const std::string& app_id,
|
| - const std::vector<std::string>& sender_ids,
|
| - const std::string& cert) {
|
| + const std::vector<std::string>& sender_ids) {
|
| std::map<std::string, RegisterCallback>::iterator callback_iter =
|
| register_callbacks_.find(app_id);
|
| if (callback_iter == register_callbacks_.end()) {
|
| @@ -643,8 +638,7 @@ void GCMProfileService::DoRegister(const std::string& app_id,
|
| base::Bind(&GCMProfileService::IOWorker::Register,
|
| io_worker_,
|
| app_id,
|
| - normalized_sender_ids,
|
| - cert));
|
| + normalized_sender_ids));
|
| }
|
|
|
| void GCMProfileService::Send(const std::string& app_id,
|
|
|