Rename "register" -> "subscribe" in the Push Messaging code.

chrome/browser/push_messaging/push_messaging_service_impl.h

 // 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.
 
 #ifndef CHROME_BROWSER_PUSH_MESSAGING_PUSH_MESSAGING_SERVICE_IMPL_H_
 #define CHROME_BROWSER_PUSH_MESSAGING_PUSH_MESSAGING_SERVICE_IMPL_H_
 
 #include <stdint.h>
 
 #include "base/callback.h"
@@ skipping 46 matching lines @@
   void OnMessagesDeleted(const std::string& app_id) override;
   void OnSendError(
       const std::string& app_id,
       const gcm::GCMClient::SendErrorDetails& send_error_details) override;
   void OnSendAcknowledged(const std::string& app_id,
                           const std::string& message_id) override;
   bool CanHandle(const std::string& app_id) const override;
 
   // content::PushMessagingService implementation:
   GURL GetPushEndpoint() override;
-  void RegisterFromDocument(
+  void SubscribeFromDocument(
       const GURL& requesting_origin,
       int64 service_worker_registration_id,
       const std::string& sender_id,
       int renderer_id,
       int render_frame_id,
       bool user_visible,
-      const content::PushMessagingService::RegisterCallback& callback) override;
-  void RegisterFromWorker(
+      const content::PushMessagingService::SubscribeCallback& callback)
+          override;

[johnme, 2015/05/07 13:31:25]

Nit: Same indent as previous line.

+  void SubscribeFromWorker(
       const GURL& requesting_origin,
       int64 service_worker_registration_id,
       const std::string& sender_id,
       bool user_visible,
-      const content::PushMessagingService::RegisterCallback& callback) override;
-  void Unregister(
+      const content::PushMessagingService::SubscribeCallback& callback)
+          override;

[johnme, 2015/05/07 13:31:25]

Nit: Same indent as previous line.

+  void Unsubscribe(
       const GURL& requesting_origin,
       int64 service_worker_registration_id,
       const std::string& sender_id,
-      const content::PushMessagingService::UnregisterCallback&) override;
+      const content::PushMessagingService::UnsubscribeCallback&) override;
   blink::WebPushPermissionStatus GetPermissionStatus(
       const GURL& requesting_origin,
       const GURL& embedding_origin,
       bool user_visible) override;
 
   // content_settings::Observer implementation.
   void OnContentSettingChanged(const ContentSettingsPattern& primary_pattern,
                                const ContentSettingsPattern& secondary_pattern,
                                ContentSettingsType content_type,
                                std::string resource_identifier) override;
 
   // KeyedService implementation.
   void Shutdown() override;
 
   void SetMessageCallbackForTesting(const base::Closure& callback);
   void SetContentSettingChangedCallbackForTesting(
       const base::Closure& callback);
 
  private:
-  // A registration is pending until it has succeeded or failed.
-  void IncreasePushRegistrationCount(int add, bool is_pending);
-  void DecreasePushRegistrationCount(int subtract, bool was_pending);
+  // A subscription is pending until it has succeeded or failed.
+  void IncreasePushSubscriptionCount(int add, bool is_pending);
+  void DecreasePushSubscriptionCount(int subtract, bool was_pending);
 
   // OnMessage methods ---------------------------------------------------------
 
   void DeliverMessageCallback(const std::string& app_id_guid,
                               const GURL& requesting_origin,
                               int64 service_worker_registration_id,
                               const gcm::GCMClient::IncomingMessage& message,
                               const base::Closure& message_handled_closure,
                               content::PushDeliveryStatus status);
 
@@ skipping 38 matching lines @@
       bool success,
       int64_t persistent_notification_id);
 
   void DidWriteNotificationData(
       const GURL& requesting_origin,
       const content::PlatformNotificationData& notification_data,
       const base::Closure& message_handled_closure,
       bool success,
       int64_t persistent_notification_id);
 
-  // Register methods ----------------------------------------------------------
+  // Subscription methods ------------------------------------------------------

[johnme, 2015/05/07 13:31:25]

Nit: "Subscribe methods" for consistency

 
-  void RegisterEnd(
-      const content::PushMessagingService::RegisterCallback& callback,
-      const std::string& registration_id,
-      content::PushRegistrationStatus status);
+  void SubscribeEnd(
+      const content::PushMessagingService::SubscribeCallback& callback,
+      const std::string& subscription_id,
+      content::PushSubscriptionStatus status);
 
-  void DidRegister(
+  void DidSubscribe(
       const PushMessagingApplicationId& application_id,
-      const content::PushMessagingService::RegisterCallback& callback,
-      const std::string& registration_id,
+      const content::PushMessagingService::SubscribeCallback& callback,
+      const std::string& subscription_id,
       gcm::GCMClient::Result result);
 
   void DidRequestPermission(
       const PushMessagingApplicationId& application_id,
       const std::string& sender_id,
-      const content::PushMessagingService::RegisterCallback& callback,
+      const content::PushMessagingService::SubscribeCallback& callback,
       ContentSetting content_setting);
 
-  // Unregister methods --------------------------------------------------------
+  // Unsubscribe methods -------------------------------------------------------
 
-  void Unregister(const std::string& app_id_guid,
-                  const std::string& sender_id,
-                  const content::PushMessagingService::UnregisterCallback&);
+  void Unsubscribe(const std::string& app_id_guid,
+                   const std::string& sender_id,
+                   const content::PushMessagingService::UnsubscribeCallback&);
 
-  void DidUnregister(bool was_registered,
-                     const content::PushMessagingService::UnregisterCallback&,
-                     gcm::GCMClient::Result result);
+  void DidUnsubscribe(bool was_subscribed,
+                      const content::PushMessagingService::UnsubscribeCallback&,
+                      gcm::GCMClient::Result result);
 
   // OnContentSettingChanged methods -------------------------------------------
 
-  void UnregisterBecausePermissionRevoked(const PushMessagingApplicationId& id,
-                                          const base::Closure& closure,
-                                          const std::string& sender_id,
-                                          bool success, bool not_found);
+  void UnsubscribeBecausePermissionRevoked(const PushMessagingApplicationId& id,
+                                           const base::Closure& closure,
+                                           const std::string& sender_id,
+                                           bool success, bool not_found);
 
   // Helper methods ------------------------------------------------------------
 
   // Checks if a given origin is allowed to use Push.
   bool HasPermission(const GURL& origin);
 
   gcm::GCMDriver* GetGCMDriver() const;
 
   Profile* profile_;
 
-  int push_registration_count_;
-  int pending_push_registration_count_;
+  int push_subscription_count_;
+  int pending_push_subscription_count_;
 
   base::Closure message_callback_for_testing_;
   base::Closure content_setting_changed_callback_for_testing_;
 
   base::WeakPtrFactory<PushMessagingServiceImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PushMessagingServiceImpl);
 };
 
 #endif  // CHROME_BROWSER_PUSH_MESSAGING_PUSH_MESSAGING_SERVICE_IMPL_H_