Push API: Fix unsubscribing from GCM on Android

chrome/browser/extensions/api/gcm/gcm_api.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/api/gcm/gcm_api.h"
 
 #include <algorithm>
 #include <map>
 #include <vector>
 
@@ skipping 115 matching lines @@
   SetResult(new base::StringValue(registration_id));
   SetError(GcmResultToError(result));
   SendResponse(gcm::GCMClient::SUCCESS == result);
 }
 
 GcmUnregisterFunction::GcmUnregisterFunction() {}
 
 GcmUnregisterFunction::~GcmUnregisterFunction() {}
 
 bool GcmUnregisterFunction::DoWork() {
+#if defined(OS_ANDROID)

[jianli, 2015/02/13 22:33:16]

gcm_api.cc is not supposed to be included for Android. So if we do want to catch
this, we'd better add these #ifdef/#error at the beginning of the file, right
below the Copyright comment.

Also the error message should say that this file should not be compiled on
Android.

[johnme, 2015/02/14 01:48:35]

The patch no longer modifies this file.

+#error If this ever gets ported to Android, you must pass the real sender ID.
+#endif
   UMA_HISTOGRAM_BOOLEAN("GCM.APICallUnregister", true);
 
+  std::vector<std::string> sender_ids;  // These are ignored on non-Android.
   GetGCMDriver()->Unregister(
       extension()->id(),
+      sender_ids,
       base::Bind(&GcmUnregisterFunction::CompleteFunctionWithResult, this));
 
   return true;
 }
 
 void GcmUnregisterFunction::CompleteFunctionWithResult(
     gcm::GCMClient::Result result) {
   SetError(GcmResultToError(result));
   SendResponse(gcm::GCMClient::SUCCESS == result);
 }
@@ skipping 89 matching lines @@
   error.details.additional_properties = send_error_details.additional_data;
 
   scoped_ptr<Event> event(new Event(
       api::gcm::OnSendError::kEventName,
       api::gcm::OnSendError::Create(error).Pass(),
       profile_));
   EventRouter::Get(profile_)->DispatchEventToExtension(app_id, event.Pass());
 }
 
 }  // namespace extensions