Push API: use an enum to indicate status.

chrome/browser/services/gcm/push_messaging_service_impl.cc

 // Copyright 2014 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/services/gcm/push_messaging_service_impl.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 124 matching lines @@
     int renderer_id,
     int render_frame_id,
     bool user_gesture,
     const content::PushMessagingService::RegisterCallback& callback) {
   if (!gcm_profile_service_->driver()) {
     NOTREACHED() << "There is no GCMDriver. Has GCMProfileService shut down?";
   }
 
   if (profile_->GetPrefs()->GetInteger(
           prefs::kPushMessagingRegistrationCount) >= kMaxRegistrations) {
-    DidRegister(app_id, callback, std::string(), GCMClient::UNKNOWN_ERROR);
+    RegisterEnd(
+        app_id,
+        callback,
+        std::string(),
+        content::PUSH_MESSAGING_STATUS_REGISTRATION_FAILED_LIMIT_REACHED);
     return;
   }
 
   // If this is registering for the first time then the driver does not have
   // this as an app handler and registration would fail.
   if (gcm_profile_service_->driver()->GetAppHandler(kAppIdPrefix) != this)
     gcm_profile_service_->driver()->AddAppHandler(kAppIdPrefix, this);
 
   content::RenderFrameHost* render_frame_host =
       content::RenderFrameHost::FromID(renderer_id, render_frame_id);
@@ skipping 14 matching lines @@
   int bridge_id = -1;
 
   const PermissionRequestID id(
       renderer_id, web_contents->GetRoutingID(), bridge_id, GURL());
 
   GURL embedder = web_contents->GetLastCommittedURL();
   gcm::PushMessagingPermissionContext* permission_context =
       gcm::PushMessagingPermissionContextFactory::GetForProfile(profile_);
 
   if (permission_context == NULL) {
-    DidRegister(app_id, callback, std::string(), GCMClient::UNKNOWN_ERROR);
+    RegisterEnd(
+        app_id,
+        callback,
+        std::string(),
+        content::PUSH_MESSAGING_STATUS_REGISTRATION_FAILED_PERMISSION_DENIED);
     return;
   }
 
   permission_context->RequestPermission(
       web_contents,
       id,
       embedder,
       user_gesture,
       base::Bind(&PushMessagingServiceImpl::DidRequestPermission,
                  weak_factory_.GetWeakPtr(),
                  sender_id,
                  app_id,
                  callback));
 }
 
-void PushMessagingServiceImpl::DidRegister(
+void PushMessagingServiceImpl::RegisterEnd(
     const std::string& app_id,
     const content::PushMessagingService::RegisterCallback& callback,
     const std::string& registration_id,
-    GCMClient::Result result) {
+    content::PushMessagingStatus status) {
   GURL endpoint = GURL("https://android.googleapis.com/gcm/send");
-  bool success = (result == GCMClient::SUCCESS);
-  callback.Run(endpoint, registration_id, success);
-  if (success) {
+  callback.Run(endpoint, registration_id, status);
+  if (status == content::PUSH_MESSAGING_STATUS_OK) {
     // TODO(johnme): Make sure the pref doesn't get out of sync after crashes.
     int registration_count = profile_->GetPrefs()->GetInteger(
         prefs::kPushMessagingRegistrationCount);
     profile_->GetPrefs()->SetInteger(prefs::kPushMessagingRegistrationCount,
                                      registration_count + 1);
   }
 }
 
+void PushMessagingServiceImpl::DidRegister(
+    const std::string& app_id,
+    const content::PushMessagingService::RegisterCallback& callback,
+    const std::string& registration_id,
+    GCMClient::Result result) {
+  content::PushMessagingStatus status =
+      result == GCMClient::SUCCESS
+          ? content::PUSH_MESSAGING_STATUS_OK
+          : content::PUSH_MESSAGING_STATUS_REGISTRATION_FAILED_SERVICE_ERROR;
+  RegisterEnd(app_id, callback, registration_id, status);
+}
+
 void PushMessagingServiceImpl::DidRequestPermission(
     const std::string& sender_id,
     const std::string& app_id,
     const content::PushMessagingService::RegisterCallback& register_callback,
     bool allow) {
   if (!allow) {
-    // TODO(miguelg) extend the error enum to allow for pemission failure.
-    DidRegister(app_id, register_callback, std::string(),
-                GCMClient::UNKNOWN_ERROR);
+    RegisterEnd(
+        app_id,
+        register_callback,
+        std::string(),
+        content::PUSH_MESSAGING_STATUS_REGISTRATION_FAILED_PERMISSION_DENIED);
     return;
   }
 
   // The GCMDriver could be NULL if GCMProfileService has been shut down.
   if (!gcm_profile_service_->driver())
     return;
 
   std::vector<std::string> sender_ids(1, sender_id);
 
   gcm_profile_service_->driver()->Register(
       app_id,
       sender_ids,
       base::Bind(&PushMessagingServiceImpl::DidRegister,
                  weak_factory_.GetWeakPtr(),
                  app_id,
                  register_callback));
 }
 
 // TODO(johnme): Unregister should decrement the pref, and call
 // RemoveAppHandler if the count drops to zero.
 
 }  // namespace gcm