Add audible support to the copresence API.

components/copresence/rpc/rpc_handler.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_COPRESENCE_RPC_RPC_HANDLER_H_
 #define COMPONENTS_COPRESENCE_RPC_RPC_HANDLER_H_
 
 #include <google/protobuf/repeated_field.h>
 
 #include <set>
@@ skipping 13 matching lines @@
 class DirectiveHandler;
 class ReportRequest;
 class RequestHeader;
 class SubscribedMessage;
 
 // This class currently handles all communication with the copresence server.
 class RpcHandler {
  public:
   // A callback to indicate whether handler initialization succeeded.
   typedef base::Callback<void(bool)> SuccessCallback;
+  typedef base::Callback<void(HttpPost*, int, const std::string&)> PostCallback;
 
   // Report rpc name to send to Apiary.
   static const char kReportRequestRpcName[];
 
   // Constructor. |delegate| is owned by the caller,
   // and must be valid as long as the RpcHandler exists.
   explicit RpcHandler(CopresenceClientDelegate* delegate);
 
   virtual ~RpcHandler();
 
@@ skipping 18 matching lines @@
   // Callback to allow tests to stub out HTTP POST behavior.
   // Arguments:
   // URLRequestContextGetter: Context for the HTTP POST request.
   // string: Name of the rpc to invoke. URL format: server.google.com/rpc_name
   // MessageLite: Contents of POST request to be sent. This needs to be
   //     a (scoped) pointer to ease handling of the abstract MessageLite class.
   // ResponseCallback: Receives the response to the request.
   typedef base::Callback<void(net::URLRequestContextGetter*,
                               const std::string&,
                               scoped_ptr<google::protobuf::MessageLite>,
-                              const HttpPost::ResponseCallback&)> PostCallback;
+                              const PostCallback&)> SendPostCallback;
 
   friend class RpcHandlerTest;
 
   void RegisterResponseHandler(const SuccessCallback& init_done_callback,
+                               HttpPost* completed_post,
                                int http_status_code,
-                               const std::string& response_data,
-                               HttpPost* completed_post);
+                               const std::string& response_data);
   void ReportResponseHandler(const StatusCallback& status_callback,
+                             HttpPost* completed_post,
                              int http_status_code,
-                             const std::string& response_data,
-                             HttpPost* completed_post);
+                             const std::string& response_data);
 
   void DispatchMessages(
       const google::protobuf::RepeatedPtrField<SubscribedMessage>&
       subscribed_messages);
 
   RequestHeader* CreateRequestHeader(const std::string& client_name) const;
 
   template <class T>
   void SendServerRequest(const std::string& rpc_name,
                          const std::string& app_id,
                          scoped_ptr<T> request,
-                         const HttpPost::ResponseCallback& response_handler);
+                         const PostCallback& response_handler);
 
   // Wrapper for the http post constructor. This is the default way
   // to contact the server, but it can be overridden for testing.
   void SendHttpPost(net::URLRequestContextGetter* url_context_getter,
                     const std::string& rpc_name,
                     scoped_ptr<google::protobuf::MessageLite> request_proto,
-                    const HttpPost::ResponseCallback& callback);
+                    const PostCallback& callback);
 
   // This method receives the request to encode a token and forwards it to
   // whispernet, setting the samples return callback to samples_callback.
   void AudioDirectiveListToWhispernetConnector(
       const std::string& token,
+      bool audible,
       const WhispernetClient::SamplesCallback& samples_callback);
 
   CopresenceClientDelegate* delegate_;  // Belongs to the caller.
   TimedMap<std::string, bool> invalid_audio_token_cache_;
-  PostCallback server_post_callback_;
+  SendPostCallback server_post_callback_;
 
   std::string device_id_;
   scoped_ptr<DirectiveHandler> directive_handler_;
   std::set<HttpPost*> pending_posts_;
 
   DISALLOW_COPY_AND_ASSIGN(RpcHandler);
 };
 
 }  // namespace copresence
 
 #endif  // COMPONENTS_COPRESENCE_RPC_RPC_HANDLER_H_