sync: add Google API Key to all ClientToServerMessages

sync/engine/syncer_proto_util.cc

 // Copyright (c) 2012 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.
 
 #include "sync/engine/syncer_proto_util.h"
 
 #include "base/format_macros.h"
 #include "base/stringprintf.h"
+#include "google_apis/google_api_keys.h"
 #include "sync/engine/net/server_connection_manager.h"
 #include "sync/engine/syncer.h"
 #include "sync/engine/syncer_types.h"
 #include "sync/engine/throttled_data_type_tracker.h"
 #include "sync/engine/traffic_logger.h"
 #include "sync/internal_api/public/base/model_type.h"
 #include "sync/protocol/sync.pb.h"
 #include "sync/protocol/sync_enums.pb.h"
 #include "sync/protocol/sync_protocol_error.h"
 #include "sync/sessions/sync_session.h"
@@ skipping 320 matching lines @@
       error_type == sync_pb::SyncEnums::NOT_MY_BIRTHDAY) {
       error.action = DISABLE_SYNC_ON_CLIENT;
   }  // There is no other action we can compute for legacy server.
   return error;
 }
 
 }  // namespace
 
 // static
 SyncerError SyncerProtoUtil::PostClientToServerMessage(
-    const ClientToServerMessage& msg,
+    ClientToServerMessage* msg,
     ClientToServerResponse* response,
     SyncSession* session) {
 
   CHECK(response);
-  DCHECK(!msg.get_updates().has_from_timestamp());  // Deprecated.
-  DCHECK(!msg.get_updates().has_requested_types());  // Deprecated.
-  DCHECK(msg.has_store_birthday() || IsVeryFirstGetUpdates(msg))
-      << "Must call AddRequestBirthday to set birthday.";
-  DCHECK(msg.has_bag_of_chips())
-      << "Must call AddBagOfChips to set bag_of_chips.";
+  DCHECK(!msg->get_updates().has_from_timestamp());  // Deprecated.
+  DCHECK(!msg->get_updates().has_requested_types());  // Deprecated.
+
+  // Add must-have fields.
+  SetProtocolVersion(msg);
+  AddRequestBirthday(session->context()->directory(), msg);
+  DCHECK(msg->has_store_birthday() || IsVeryFirstGetUpdates(*msg));
+  AddBagOfChips(session->context()->directory(), msg);
+  msg->set_api_key(google_apis::GetAPIKey());
 
   syncable::Directory* dir = session->context()->directory();
 
-  LogClientToServerMessage(msg);
-  session->context()->traffic_recorder()->RecordClientToServerMessage(msg);
+  LogClientToServerMessage(*msg);
+  session->context()->traffic_recorder()->RecordClientToServerMessage(*msg);
   if (!PostAndProcessHeaders(session->context()->connection_manager(), session,
-                             msg, response)) {
+                             *msg, response)) {
     // There was an error establishing communication with the server.
     // We can not proceed beyond this point.
     const HttpResponse::ServerConnectionCode server_status =
         session->context()->connection_manager()->server_status();
 
     DCHECK_NE(server_status, HttpResponse::NONE);
     DCHECK_NE(server_status, HttpResponse::SERVER_CONNECTION_OK);
 
     return ServerConnectionErrorAsSyncerError(server_status);
   }
@@ skipping 216 matching lines @@
 std::string SyncerProtoUtil::ClientToServerResponseDebugString(
     const ClientToServerResponse& response) {
   // Add more handlers as needed.
   std::string output;
   if (response.has_get_updates())
     output.append(GetUpdatesResponseString(response.get_updates()));
   return output;
 }
 
 }  // namespace syncer