Adding support for authenticated copresence calls

components/copresence/copresence_manager_impl.h

Index: components/copresence/copresence_manager_impl.h
diff --git a/components/copresence/copresence_manager_impl.h b/components/copresence/copresence_manager_impl.h
index 035f4621f895e289c3e7dc903782249d7ae5ea07..57687fb4b342696d78495599bffc97e23a19a8e2 100644
--- a/components/copresence/copresence_manager_impl.h
+++ b/components/copresence/copresence_manager_impl.h
@@ -25,20 +25,24 @@ class RpcHandler;
 
 struct PendingRequest {
   PendingRequest(const ReportRequest& report,
-                 const std::string app_id,
+                 const std::string& app_id,
+                 const std::string& auth_token,
                  const StatusCallback& callback);
   ~PendingRequest();
 
-  ReportRequest report;
+  scoped_ptr<ReportRequest> report;
   std::string app_id;
+  std::string auth_token;
   StatusCallback callback;
 };
 
-// The implementation for CopresenceManager.
+// The implementation for CopresenceManager. Responsible primarily for
+// client-side initialization. The RpcHandler handles all the details
+// of interacting with the server.
 class CopresenceManagerImpl : public CopresenceManager {
  public:
   ~CopresenceManagerImpl() override;
-  void ExecuteReportRequest(ReportRequest request,
+  void ExecuteReportRequest(const ReportRequest& request,
                             const std::string& app_id,
                             const StatusCallback& callback) override;
 
@@ -51,15 +55,15 @@ class CopresenceManagerImpl : public CopresenceManager {
   void InitStepComplete(const std::string& step, bool success);
 
   bool init_failed_;
-  std::vector<PendingRequest> pending_requests_queue_;
+  std::vector<scoped_ptr<PendingRequest>> pending_requests_queue_;

[rkc, 2014/10/28 04:12:46]

Don't use scoped_ptrs in std C++ containers; they move around and make multiple
copies of their members. Usually if you need a vector of pointers that you want
scoped, use ScopedVector. Looking at your use case though, you can't use a
ScopedVector either (since the scoped vector owns all the pointers till it is
destructed). It may be best just to leave this as it is.

[Charlie, 2014/10/28 22:51:52]

Actually the ScopedVector works just fine. We don't want ownership of the
PendingRequest pointers, only their contents.

 
-  base::CancelableCallback<void(bool)> init_callback_;
+  base::CancelableCallback<void(bool)> whispernet_init_callback_;
 
   // TODO(rkc): This code is almost identical to what we use in feedback to
   // perform multiple blocking tasks and then run a post process method. Look
   // into refactoring it all out to a common construct, like maybe a
   // PostMultipleTasksAndReply?
-  size_t pending_init_operations_;
+  int pending_init_operations_;
 
   CopresenceDelegate* const delegate_;
   scoped_ptr<RpcHandler> rpc_handler_;