Teach the GCM Driver how to decrypt incoming messages.

chrome/browser/push_messaging/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/push_messaging/push_messaging_service_impl.h"
 
 #include <vector>
 
 #include "base/barrier_closure.h"
 #include "base/bind.h"
@@ skipping 176 matching lines @@
                            message, message_handled_closure,
                            content::PUSH_DELIVERY_STATUS_PERMISSION_DENIED);
     return;
   }
 
   rappor::SampleDomainAndRegistryFromGURL(
       g_browser_process->rappor_service(),
       "PushMessaging.MessageReceived.Origin",
       app_identifier.origin());
 
-  // The Push API only exposes a single string of data in the push event fired
-  // on the Service Worker. When developers send messages using GCM to the Push
-  // API and want to include a message payload, they must pass a single key-
-  // value pair, where the key is "data" and the value is the string they want
-  // to be passed to their Service Worker. For example, they could send the
-  // following JSON using the HTTPS GCM API:
-  // {
-  //     "registration_ids": ["FOO", "BAR"],
-  //     "data": {
-  //         "data": "BAZ",
-  //     },
-  //     "delay_while_idle": true,
-  // }
-  // TODO(johnme): Make sure this is clearly documented for developers.
   std::string data;
-  // TODO(peter): Message payloads are disabled pending mandatory encryption.
-  // https://crbug.com/449184
-  if (AreMessagePayloadsEnabled()) {
-    gcm::MessageData::const_iterator it = message.data.find("data");
-    if (it != message.data.end())
-      data = it->second;
-  }
+  if (AreMessagePayloadsEnabled() && message.raw_data.size())
+    data = message.raw_data.size();

[johnme, 2015/07/21 13:52:20]

Remove the .size()

[Peter Beverloo, 2015/08/03 18:55:34]

Done.

 
   content::BrowserContext::DeliverPushMessage(
       profile_,
       app_identifier.origin(),
       app_identifier.service_worker_registration_id(),
       data,
       base::Bind(&PushMessagingServiceImpl::DeliverMessageCallback,
                  weak_factory_.GetWeakPtr(),
                  app_identifier.app_id(), app_identifier.origin(),
                  app_identifier.service_worker_registration_id(), message,
@@ skipping 501 matching lines @@
       switches::kEnablePushMessagePayload);
 }
 
 gcm::GCMDriver* PushMessagingServiceImpl::GetGCMDriver() const {
   gcm::GCMProfileService* gcm_profile_service =
       gcm::GCMProfileServiceFactory::GetForProfile(profile_);
   CHECK(gcm_profile_service);
   CHECK(gcm_profile_service->driver());
   return gcm_profile_service->driver();
 }