Teach the GCM Driver how to decrypt incoming messages.

components/gcm_driver/gcm_driver.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 COMPONENTS_GCM_DRIVER_GCM_DRIVER_H_
 #define COMPONENTS_GCM_DRIVER_GCM_DRIVER_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 247 matching lines @@
   void UnregisterFinished(const std::string& app_id,
                           GCMClient::Result result);
 
   // Runs the Send callback.
   void SendFinished(const std::string& app_id,
                     const std::string& message_id,
                     GCMClient::Result result);
 
   bool HasRegisterCallback(const std::string& app_id);
 
+  // Dispatches the OnMessage event to the app handler associated with |app_id|.
+  // If the |message| has been encrypted, it will be asynchronously decrypted
+  // before being dispatched to the handler associated with |app_id|.
+  void DispatchMessage(const std::string& app_id,
+                       const IncomingMessage& message);
+
   void ClearCallbacks();
 
  private:
   // Common code shared by Unregister and UnregisterWithSenderId.
   void UnregisterInternal(const std::string& app_id,
                           const std::string* sender_id,
                           const UnregisterCallback& callback);
 
   // Called after unregistration completes in order to trigger the pending
   // registration.
   void RegisterAfterUnregister(
       const std::string& app_id,
       const std::vector<std::string>& normalized_sender_ids,
       const UnregisterCallback& unregister_callback,
       GCMClient::Result result);
 
+  // Dispatches |message| to |app_id| if the decryption was successful.
+  void DispatchDecryptedMessage(const std::string& app_id,

[jianli, 2015/08/04 00:49:30]

This method might also dispatch an error event in the future. So the name
DispatchDecryptedMessage does not reflect this potential new behavior. How about
DispatchMessageUponDecryption?

[Peter Beverloo, 2015/09/25 16:37:35]

This doesn't apply anymore due to re-using DispatchMessage().

+                                const IncomingMessage& message,
+                                bool decryption_successful);
+
   // Callback map (from app_id to callback) for Register.
   std::map<std::string, RegisterCallback> register_callbacks_;
 
   // Callback map (from app_id to callback) for Unregister.
   std::map<std::string, UnregisterCallback> unregister_callbacks_;
 
   // 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_;
 
   // The default handler when no app handler can be found in the map.
   DefaultGCMAppHandler default_app_handler_;
 
   base::WeakPtrFactory<GCMDriver> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GCMDriver);
 };
 
 }  // namespace gcm
 
 #endif  // COMPONENTS_GCM_DRIVER_GCM_DRIVER_H_