Revert of Hook up the Push API with GCM's new ability to own encryption keys.

chrome/browser/push_messaging/push_messaging_service_impl.h

Index: chrome/browser/push_messaging/push_messaging_service_impl.h
diff --git a/chrome/browser/push_messaging/push_messaging_service_impl.h b/chrome/browser/push_messaging/push_messaging_service_impl.h
index b27745b9692b24e93b1e9f5d79bbfc472fe244e8..333497c2725b5e76160cd1ab956befc55ba6c42d 100644
--- a/chrome/browser/push_messaging/push_messaging_service_impl.h
+++ b/chrome/browser/push_messaging/push_messaging_service_impl.h
@@ -143,24 +143,11 @@
       const std::string& subscription_id,
       gcm::GCMClient::Result result);
 
-  void DidSubscribeWithPublicKey(
-      const PushMessagingAppIdentifier& app_identifier,
-      const content::PushMessagingService::RegisterCallback& callback,
-      const std::string& subscription_id,
-      const std::string& public_key);
-
   void DidRequestPermission(
       const PushMessagingAppIdentifier& app_identifier,
       const std::string& sender_id,
       const content::PushMessagingService::RegisterCallback& callback,
       content::PermissionStatus permission_status);
-
-  // GetPublicEncryptionKey method ---------------------------------------------
-
-  void DidGetPublicKey(
-      const PushMessagingService::PublicKeyCallback& callback,
-      const std::string& public_key) const;
-
 
   // Unsubscribe methods -------------------------------------------------------
 
@@ -186,9 +173,6 @@
   // Checks if a given origin is allowed to use Push.
   bool IsPermissionSet(const GURL& origin);
 
-  // Returns whether incoming messages should support payloads.
-  bool AreMessagePayloadsEnabled() const;
-
   gcm::GCMDriver* GetGCMDriver() const;
 
   Profile* profile_;