Push API: Return cached registration if available.

chrome/browser/services/gcm/push_messaging_service_impl.cc

Index: chrome/browser/services/gcm/push_messaging_service_impl.cc
diff --git a/chrome/browser/services/gcm/push_messaging_service_impl.cc b/chrome/browser/services/gcm/push_messaging_service_impl.cc
index 501f6ce29543374cbec4a0c8a9f1b4ede685a47a..d1dda2e76abb3d72f80b3bfa829c553e8714c15c 100644
--- a/chrome/browser/services/gcm/push_messaging_service_impl.cc
+++ b/chrome/browser/services/gcm/push_messaging_service_impl.cc
@@ -372,7 +372,7 @@ void PushMessagingServiceImpl::RegisterEnd(
     const std::string& registration_id,
     content::PushRegistrationStatus status) {
   callback.Run(registration_id, status);
-  if (status == content::PUSH_REGISTRATION_STATUS_SUCCESS)
+  if (status == content::PUSH_REGISTRATION_STATUS_SUCCESS_FROM_PUSH_SERVICE)
     IncreasePushRegistrationCount(1);
 }
 
@@ -382,7 +382,7 @@ void PushMessagingServiceImpl::DidRegister(
     GCMClient::Result result) {
   content::PushRegistrationStatus status =
       result == GCMClient::SUCCESS
-          ? content::PUSH_REGISTRATION_STATUS_SUCCESS
+          ? content::PUSH_REGISTRATION_STATUS_SUCCESS_FROM_PUSH_SERVICE
           : content::PUSH_REGISTRATION_STATUS_SERVICE_ERROR;
   RegisterEnd(callback, registration_id, status);
 }