Adding support for authenticated copresence calls

components/copresence/rpc/rpc_handler.cc

Index: components/copresence/rpc/rpc_handler.cc
diff --git a/components/copresence/rpc/rpc_handler.cc b/components/copresence/rpc/rpc_handler.cc
index 7c4d121f77444164bb3109dac558a1036747259b..b80bfddc04982250a124f3df136c52ba6a615f54 100644
--- a/components/copresence/rpc/rpc_handler.cc
+++ b/components/copresence/rpc/rpc_handler.cc
@@ -60,8 +60,7 @@ const char kDefaultCopresenceServer[] =
 bool CopresenceErrorLogged(const Status& status) {
   if (status.code() != OK) {
     LOG(ERROR) << "Copresence error code " << status.code()
-               << (status.message().empty() ? std::string() :
-                  ": " + status.message());
+               << (status.message().empty() ? "" : ": " + status.message());
   }
   return status.code() != OK;
 }
@@ -180,7 +179,7 @@ void RpcHandler::Initialize(const SuccessCallback& init_done_callback) {
   identity->set_chrome_id(base::GenerateGUID());
   SendServerRequest(
       kRegisterDeviceRpcName,
-      std::string(),
+      "",

[rkc, 2014/10/21 22:48:38]

std::string(), here and below.

[Charlie, 2014/10/21 23:19:44]

Done.

       request.Pass(),
       base::Bind(&RpcHandler::RegisterResponseHandler,
                  // On destruction, this request will be cancelled.
@@ -189,7 +188,7 @@ void RpcHandler::Initialize(const SuccessCallback& init_done_callback) {
 }
 
 void RpcHandler::SendReportRequest(scoped_ptr<ReportRequest> request) {
-  SendReportRequest(request.Pass(), std::string(), StatusCallback());
+  SendReportRequest(request.Pass(), "", StatusCallback());
 }
 
 void RpcHandler::SendReportRequest(scoped_ptr<ReportRequest> request,
@@ -425,7 +424,7 @@ RequestHeader* RpcHandler::CreateRequestHeader(
       "Chrome", delegate_->GetPlatformVersionString()));
   if (!client_name.empty()) {
     header->set_allocated_client_version(
-        CreateVersion(client_name, std::string()));
+        CreateVersion(client_name, ""));
   }
   header->set_current_time_millis(base::Time::Now().ToJsTime());
   header->set_registered_device_id(device_id_);
@@ -447,12 +446,14 @@ void RpcHandler::SendServerRequest(
   request->set_allocated_header(CreateRequestHeader(app_id));
   server_post_callback_.Run(delegate_->GetRequestContext(),
                             rpc_name,
+                            app_id,
                             make_scoped_ptr<MessageLite>(request.release()),
                             response_handler);
 }
 
 void RpcHandler::SendHttpPost(net::URLRequestContextGetter* url_context_getter,
                               const std::string& rpc_name,
+                              const std::string& app_id,
                               scoped_ptr<MessageLite> request_proto,
                               const PostCleanupCallback& callback) {
   // Create the base URL to call.
@@ -467,8 +468,9 @@ void RpcHandler::SendHttpPost(net::URLRequestContextGetter* url_context_getter,
       url_context_getter,
       copresence_server_host,
       rpc_name,
+      delegate_->GetAPIKey(app_id),
+      delegate_->GetAuthToken(app_id),
       command_line->GetSwitchValueASCII(switches::kCopresenceTracingToken),
-      delegate_->GetAPIKey(),
       *request_proto);
 
   http_post->Start(base::Bind(callback, http_post));