Adding support for authenticated copresence calls

components/copresence/copresence_manager_impl.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_COPRESENCE_MANAGER_IMPL_H_
 #define COMPONENTS_COPRESENCE_COPRESENCE_MANAGER_IMPL_H_
 
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/cancelable_callback.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "components/copresence/proto/rpcs.pb.h"
 #include "components/copresence/public/copresence_manager.h"
 
 namespace net {
 class URLContextGetter;
 }
 
 namespace copresence {
 
 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;
 
  private:
   // Create managers with the CopresenceManager::Create() method.
   friend class CopresenceManager;
   CopresenceManagerImpl(CopresenceDelegate* delegate);
 
   void CompleteInitialization();
   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_;
 
   DISALLOW_COPY_AND_ASSIGN(CopresenceManagerImpl);
 };
 
 }  // namespace copresence
 
 #endif  // COMPONENTS_COPRESENCE_COPRESENCE_MANAGER_IMPL_H_