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 117 matching lines @@
   SendResponse(gcm::GCMClient::SUCCESS == result);
 }
 
 GcmUnregisterFunction::GcmUnregisterFunction() {}
 
 GcmUnregisterFunction::~GcmUnregisterFunction() {}
 
 bool GcmUnregisterFunction::DoWork() {
   UMA_HISTOGRAM_BOOLEAN("GCM.APICallUnregister", true);
 
+#if defined(OS_ANDROID)
+  LOG(FATAL) << "GcmUnregisterFunction is not implemented on Android";

[jianli, 2015/02/10 23:19:25]

I think this extension related file is never linked into Android, right?

[johnme, 2015/02/12 19:15:25]

I think that's right, but I wanted there to be a clear warning if it ever gets
ported to Android.

[jianli, 2015/02/12 20:03:30]

If this is your purpose, you'd better use #error directive to fail the
compilation, instead of logging. And probably you do this at the very beginning.

[johnme, 2015/02/13 19:11:56]

Done (not sure what you meant by at the very beginning - I've moved it to the
beginning of the method, but it seems better to have it here than at the
beginning of the file, since this is the reason it's incompatible with Android).

+#else
+  std::vector<std::string> sender_ids;  // These are ignored on desktop.
   GetGCMDriver()->Unregister(
       extension()->id(),
+      sender_ids,
       base::Bind(&GcmUnregisterFunction::CompleteFunctionWithResult, this));
 
   return true;
+#endif
 }
 
 void GcmUnregisterFunction::CompleteFunctionWithResult(
     gcm::GCMClient::Result result) {
   SetError(GcmResultToError(result));
   SendResponse(gcm::GCMClient::SUCCESS == result);
 }
 
 GcmSendFunction::GcmSendFunction() {}
 
@@ skipping 86 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