Implement some follow-ups after mojofiction of Push-messaging.

content/renderer/push_messaging/push_messaging_client.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 "content/renderer/push_messaging/push_messaging_client.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/bind_helpers.h"
@@ skipping 59 matching lines @@
 void PushMessagingClient::DidGetManifest(
     blink::WebServiceWorkerRegistration* service_worker_registration,
     const blink::WebPushSubscriptionOptions& options,
     std::unique_ptr<blink::WebPushSubscriptionCallbacks> callbacks,
     const GURL& manifest_url,
     const Manifest& manifest,
     const ManifestDebugInfo&) {
   // Get the sender_info from the manifest since it wasn't provided by
   // the caller.
   if (manifest.IsEmpty()) {
-    SubscribeCallback(std::move(callbacks),
-                      PUSH_REGISTRATION_STATUS_MANIFEST_EMPTY_OR_MISSING,
-                      base::nullopt, base::nullopt, base::nullopt,
-                      base::nullopt);
+    DidSubscribe(std::move(callbacks),
+                 PUSH_REGISTRATION_STATUS_MANIFEST_EMPTY_OR_MISSING,
+                 base::nullopt, base::nullopt, base::nullopt, base::nullopt);
     return;
   }
 
   PushSubscriptionOptions content_options;
   content_options.user_visible_only = options.userVisibleOnly;
   if (!manifest.gcm_sender_id.is_null()) {
     content_options.sender_info =
         base::UTF16ToUTF8(manifest.gcm_sender_id.string());
   }
 
   DoSubscribe(service_worker_registration, content_options,
               std::move(callbacks));
 }
 
 void PushMessagingClient::DoSubscribe(
     blink::WebServiceWorkerRegistration* service_worker_registration,
     const PushSubscriptionOptions& options,
     std::unique_ptr<blink::WebPushSubscriptionCallbacks> callbacks) {
   int64_t service_worker_registration_id =
       static_cast<WebServiceWorkerRegistrationImpl*>(
           service_worker_registration)
           ->registrationId();
 
   if (options.sender_info.empty()) {
-    SubscribeCallback(std::move(callbacks),
-                      PUSH_REGISTRATION_STATUS_NO_SENDER_ID, base::nullopt,
-                      base::nullopt, base::nullopt, base::nullopt);
+    DidSubscribe(std::move(callbacks), PUSH_REGISTRATION_STATUS_NO_SENDER_ID,
+                 base::nullopt, base::nullopt, base::nullopt, base::nullopt);
     return;
   }
 
   DCHECK(push_messaging_manager_);
   push_messaging_manager_->Subscribe(
       routing_id(), service_worker_registration_id, options,
       // Safe to use base::Unretained because |push_messaging_manager_ |is
       // owned by |this|.
-      base::Bind(&PushMessagingClient::SubscribeCallback,
-                 base::Unretained(this), base::Passed(&callbacks)));
+      base::Bind(&PushMessagingClient::DidSubscribe, base::Unretained(this),
+                 base::Passed(&callbacks)));
 }
 
-void PushMessagingClient::SubscribeCallback(
+void PushMessagingClient::DidSubscribe(
     std::unique_ptr<blink::WebPushSubscriptionCallbacks> callbacks,
     content::PushRegistrationStatus status,
     const base::Optional<GURL>& endpoint,
     const base::Optional<content::PushSubscriptionOptions>& options,
     const base::Optional<std::vector<uint8_t>>& p256dh,
     const base::Optional<std::vector<uint8_t>>& auth) {
   DCHECK(callbacks);
 
   if (status == PUSH_REGISTRATION_STATUS_SUCCESS_FROM_PUSH_SERVICE ||
       status == PUSH_REGISTRATION_STATUS_SUCCESS_FROM_CACHE) {
     DCHECK(endpoint);
     DCHECK(options);
     DCHECK(p256dh);
     DCHECK(auth);
 
     callbacks->onSuccess(base::MakeUnique<blink::WebPushSubscription>(
         endpoint.value(), options.value().user_visible_only,
         blink::WebString::fromLatin1(options.value().sender_info),
         p256dh.value(), auth.value()));
   } else {
     callbacks->onError(PushRegistrationStatusToWebPushError(status));
   }
 }
 
 }  // namespace content