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

components/gcm_driver/gcm_driver.h

Index: components/gcm_driver/gcm_driver.h
diff --git a/components/gcm_driver/gcm_driver.h b/components/gcm_driver/gcm_driver.h
index 572c02d8b793d035901b76021e924d4dbd04f9de..4095f3e41371c6d093684b56e3303b077992c56f 100644
--- a/components/gcm_driver/gcm_driver.h
+++ b/components/gcm_driver/gcm_driver.h
@@ -11,18 +11,11 @@
 
 #include "base/callback.h"
 #include "base/macros.h"
-#include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread_checker.h"
 #include "components/gcm_driver/common/gcm_messages.h"
-#include "components/gcm_driver/crypto/gcm_encryption_provider.h"
 #include "components/gcm_driver/default_gcm_app_handler.h"
 #include "components/gcm_driver/gcm_client.h"
-
-namespace base {
-class FilePath;
-class SequencedTaskRunner;
-}
 
 namespace gcm {
 
@@ -79,14 +72,11 @@
                               GCMClient::Result result)> RegisterCallback;
   typedef base::Callback<void(const std::string& message_id,
                               GCMClient::Result result)> SendCallback;
-  typedef base::Callback<void(const std::string&)> GetPublicKeyCallback;
   typedef base::Callback<void(GCMClient::Result result)> UnregisterCallback;
   typedef base::Callback<void(const GCMClient::GCMStatistics& stats)>
       GetGCMStatisticsCallback;
 
-  GCMDriver(
-      const base::FilePath& store_path,
-      const scoped_refptr<base::SequencedTaskRunner>& blocking_task_runner);
+  GCMDriver();
   virtual ~GCMDriver();
 
   // Registers |sender_ids| for an app. A registration ID will be returned by
@@ -126,12 +116,6 @@
             const std::string& receiver_id,
             const OutgoingMessage& message,
             const SendCallback& callback);
-
-  // Get the public encryption key associated with |app_id|. If no keys have
-  // been associated with |app_id| yet, they will be created. The |callback|
-  // will be invoked when it is available.
-  void GetPublicKey(const std::string& app_id,
-                    const GetPublicKeyCallback& callback);
 
   const GCMAppHandlerMap& app_handlers() const { return app_handlers_; }
 
@@ -290,10 +274,6 @@
   // Callback map (from <app_id, message_id> to callback) for Send.
   std::map<std::pair<std::string, std::string>, SendCallback> send_callbacks_;
 
-  // The encryption provider, used for key management and decryption of
-  // encrypted, incoming messages.
-  GCMEncryptionProvider encryption_provider_;
-
   // App handler map (from app_id to handler pointer).
   // The handler is not owned.
   GCMAppHandlerMap app_handlers_;