Dispatch push event to worker from PushServiceImpl#OnMessage.

chrome/browser/services/gcm/push_messaging_service_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 "chrome/browser/services/gcm/push_messaging_service_impl.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_util.h"
 #include "chrome/browser/content_settings/permission_request_id.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/services/gcm/gcm_profile_service.h"
 #include "chrome/browser/services/gcm/gcm_profile_service_factory.h"
 #include "chrome/browser/services/gcm/push_messaging_permission_context.h"
 #include "chrome/browser/services/gcm/push_messaging_permission_context_factory.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "components/gcm_driver/gcm_driver.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "content/public/browser/push_messaging_application_id.h"
+#include "content/public/browser/push_messaging_router.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
 
 namespace gcm {
 
 namespace {
 const int kMaxRegistrations = 1000000;
 }  // namespace
 
 // static
@@ skipping 32 matching lines @@
   gcm_service->driver()->AddAppHandler(
       content::kPushMessagingApplicationIdPrefix, push_service);
 }
 
 PushMessagingServiceImpl::PushMessagingServiceImpl(
     GCMProfileService* gcm_profile_service,
     Profile* profile)
     : gcm_profile_service_(gcm_profile_service),
       profile_(profile),
       weak_factory_(this) {
+  push_messaging_router_ = content::PushMessagingRouter::Create(profile);

[johnme, 2014/07/23 14:25:23]

Nit: I guess this could be in the initializer list? But I don't really mind.

[Michael van Ouwerkerk, 2014/07/23 16:57:51]

Done.

 }
 
 PushMessagingServiceImpl::~PushMessagingServiceImpl() {
   // TODO(johnme): If it's possible for this to be destroyed before GCMDriver,
   // then we should call RemoveAppHandler.
 }
 
 bool PushMessagingServiceImpl::CanHandle(const std::string& app_id) const {
   return content::PushMessagingApplicationId::Parse(app_id).is_valid();
 }
@@ skipping 16 matching lines @@
   //         "data": "BAZ",
   //     },
   //     "delay_while_idle": true,
   // }
   // TODO(johnme): Make sure this is clearly documented for developers.
   content::PushMessagingApplicationId application_id =
       content::PushMessagingApplicationId::Parse(app_id);
   DCHECK(application_id.is_valid());
   GCMClient::MessageData::const_iterator it = message.data.find("data");
   if (application_id.is_valid() && it != message.data.end()) {
-    const std::string& data ALLOW_UNUSED = it->second;
-    // TODO(mvanouwerkerk): Fire push event with data on the Service Worker
-    // corresponding to app_id (and remove ALLOW_UNUSED above).
+    const std::string& data = it->second;
+    push_messaging_router_->SendMessage(
+        application_id,
+        data,
+        base::Bind(&PushMessagingServiceImpl::SendMessageCallback,
+                   weak_factory_.GetWeakPtr(),
+                   application_id,
+                   message));
   } else {
     // Drop the message, as it is invalid.
     // TODO(mvanouwerkerk): Show a warning in the developer console of the
     // Service Worker corresponding to app_id.
     // TODO(johnme): Add diagnostic observers (e.g. UMA and an internals page)
     // to know when bad things happen.
   }
 }
 
+void PushMessagingServiceImpl::SendMessageCallback(
+    const content::PushMessagingApplicationId& application_id,
+    const GCMClient::IncomingMessage& message,
+    content::PushMessagingStatus status) {
+  // TODO(mvanouwerkerk): UMA logging.
+  // TODO(mvanouwerkerk): Is there a way to recover from failure?
+}
+
 void PushMessagingServiceImpl::OnMessagesDeleted(const std::string& app_id) {
   // TODO(mvanouwerkerk): Fire push error event on the Service Worker
   // corresponding to app_id.
 }
 
 void PushMessagingServiceImpl::OnSendError(
     const std::string& app_id,
     const GCMClient::SendErrorDetails& send_error_details) {
   NOTREACHED() << "The Push API shouldn't have sent messages upstream";
 }
@@ skipping 126 matching lines @@
       base::Bind(&PushMessagingServiceImpl::DidRegister,
                  weak_factory_.GetWeakPtr(),
                  app_id,
                  register_callback));
 }
 
 // TODO(johnme): Unregister should decrement the pref, and call
 // RemoveAppHandler if the count drops to zero.
 
 }  // namespace gcm