Integrate InstanceID with GCM crypto provider

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 120 matching lines @@
   // |receiver_id|: registration ID of the receiver party.
   // |message|: message to be sent.
   // |callback|: to be called once the asynchronous operation is done.
   void Send(const std::string& app_id,
             const std::string& receiver_id,
             const OutgoingMessage& message,
             const SendCallback& callback);
 
   // Get the public encryption key and the authentication secret associated with
   // |app_id|. If none have been associated with |app_id| yet, they will be
-  // created. The |callback| will be invoked when it is available.
+  // created. The |callback| will be invoked when it is available. Only use with
+  // GCM registrations; use InstanceID::GetEncryptionInfo for InstanceID tokens.
   void GetEncryptionInfo(const std::string& app_id,
                          const GetEncryptionInfoCallback& callback);
 
   const GCMAppHandlerMap& app_handlers() const { return app_handlers_; }
 
   // This method must be called before destroying the GCMDriver. Once it has
   // been called, no other GCMDriver methods may be used.
   virtual void Shutdown();
 
   // Called when the user signs in to or out of a GAIA account.
@@ skipping 53 matching lines @@
   virtual void RemoveAccountMapping(const std::string& account_id) = 0;
 
   // Getter and setter of last token fetch time.
   virtual base::Time GetLastTokenFetchTime() = 0;
   virtual void SetLastTokenFetchTime(const base::Time& time) = 0;
 
   // Sets whether or not GCM should try to wake the system from suspend in order
   // to send a heartbeat message.
   virtual void WakeFromSuspendForHeartbeat(bool wake) = 0;
 
-  // Supports InstanceID handling. Must only be used by the InstanceID system.
+  // These methods must only be used by the InstanceID system.
+  // The InstanceIDHandler provides an implementation for the InstanceID system.
   virtual InstanceIDHandler* GetInstanceIDHandlerInternal() = 0;
+  // Allows the InstanceID system to integrate with GCM encryption storage.
+  GCMEncryptionProvider* GetEncryptionProviderInternal();
 
   // Adds or removes a custom client requested heartbeat interval. If multiple
   // components set that setting, the lowest setting will be used. If the
   // setting is outside of GetMax/MinClientHeartbeatIntervalMs() it will be
   // ignored. If a new setting is less than the currently used, the connection
   // will be reset with the new heartbeat. Client that no longer require
   // aggressive heartbeats, should remove their requested interval. Heartbeats
   // set this way survive connection/Chrome restart.
   //
   // GCM Driver can decide to postpone the action until Client is properly
@@ skipping 107 matching lines @@
   DefaultGCMAppHandler default_app_handler_;
 
   base::WeakPtrFactory<GCMDriver> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GCMDriver);
 };
 
 }  // namespace gcm
 
 #endif  // COMPONENTS_GCM_DRIVER_GCM_DRIVER_H_