Adding support for pre-sent messages

components/copresence/handlers/gcm_handler_impl.cc

 // 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.
 
 #include "components/copresence/handlers/gcm_handler_impl.h"
 
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/strings/string_util.h"
@@ skipping 25 matching lines @@
 
 const char GCMHandlerImpl::kCopresenceAppId[] =
     "com.google.android.gms.location.copresence";
 const char GCMHandlerImpl::kCopresenceSenderId[] = "745476177629";
 const char GCMHandlerImpl::kGcmMessageKey[] = "PUSH_MESSAGE";
 
 
 // Public functions.
 
 GCMHandlerImpl::GCMHandlerImpl(gcm::GCMDriver* gcm_driver,
-                               DirectiveHandler* directive_handler)
+                               DirectiveHandler* directive_handler,
+                               const MessagesCallback& new_messages_callback)
     : driver_(gcm_driver),
       directive_handler_(directive_handler),
+      new_messages_callback_(new_messages_callback),
       registration_callback_(base::Bind(&GCMHandlerImpl::RegistrationComplete,
                                         base::Unretained(this))) {
   DCHECK(driver_);
   DCHECK(directive_handler_);
 
   driver_->AddAppHandler(kCopresenceAppId, this);
   driver_->Register(kCopresenceAppId,
                     std::vector<std::string>(1, kCopresenceSenderId),
                     registration_callback_.callback());
 }
@@ skipping 39 matching lines @@
     return;
   }
 
   if (push_message.type() != PushMessage::REPORT) {
     DVLOG(2) << "Discarding non-report GCM message";
     return;
   }
 
   DVLOG(3) << "Processing " << push_message.report().directive_size()
            << " directive(s) from GCM message";
-  for (const Directive& directive : push_message.report().directive())
+  for (const Directive& directive : push_message.report().directive()) {
+    // TODO(ckehoe): Use a callback here so GCMHandler
+    // is decoupled from DirectiveHandler.
     directive_handler_->AddDirective(directive);
+  }
 
-  int message_count = push_message.report().subscribed_message_size();
-  LOG_IF(WARNING, message_count > 0)
-      << "Discarding " << message_count << " copresence messages sent via GCM";
+  new_messages_callback_.Run(push_message.report().subscribed_message());
 }
 
 void GCMHandlerImpl::OnMessagesDeleted(const std::string& app_id) {
   DCHECK_EQ(kCopresenceAppId, app_id);
   DVLOG(2) << "GCM message overflow reported";
 }
 
 void GCMHandlerImpl::OnSendError(
     const std::string& /* app_id */,
     const GCMClient::SendErrorDetails& /* send_error_details */) {
@@ skipping 22 matching lines @@
   }
 
   for (const RegistrationCallback& callback : pending_id_requests_) {
     callback.Run(result == GCMClient::SUCCESS ?
         registration_id : std::string());
   }
   pending_id_requests_.clear();
 }
 
 }  // namespace copresence