| Index: content/child/push_messaging/push_provider.cc
|
| diff --git a/content/child/push_messaging/push_provider.cc b/content/child/push_messaging/push_provider.cc
|
| index e326d137581cc64cd72c5f9cd778ce35253a4666..927da07baa35fd30984f680cc51c482e0198c973 100644
|
| --- a/content/child/push_messaging/push_provider.cc
|
| +++ b/content/child/push_messaging/push_provider.cc
|
| @@ -148,17 +148,14 @@ bool PushProvider::OnMessageReceived(const IPC::Message& message) {
|
|
|
| void PushProvider::OnSubscribeFromWorkerSuccess(
|
| int request_id,
|
| - const GURL& endpoint,
|
| - const std::string& subscription_id) {
|
| + const GURL& endpoint) {
|
| blink::WebPushSubscriptionCallbacks* callbacks =
|
| subscription_callbacks_.Lookup(request_id);
|
| if (!callbacks)
|
| return;
|
|
|
| scoped_ptr<blink::WebPushSubscription> subscription(
|
| - new blink::WebPushSubscription(
|
| - blink::WebString::fromUTF8(endpoint.spec()),
|
| - blink::WebString::fromUTF8(subscription_id)));
|
| + new blink::WebPushSubscription(endpoint));
|
| callbacks->onSuccess(subscription.release());
|
|
|
| subscription_callbacks_.Remove(request_id);
|
| @@ -208,17 +205,14 @@ void PushProvider::OnUnsubscribeError(
|
|
|
| void PushProvider::OnGetRegistrationSuccess(
|
| int request_id,
|
| - const GURL& endpoint,
|
| - const std::string& registration_id) {
|
| + const GURL& endpoint) {
|
| blink::WebPushSubscriptionCallbacks* callbacks =
|
| subscription_callbacks_.Lookup(request_id);
|
| if (!callbacks)
|
| return;
|
|
|
| scoped_ptr<blink::WebPushSubscription> subscription(
|
| - new blink::WebPushSubscription(
|
| - blink::WebString::fromUTF8(endpoint.spec()),
|
| - blink::WebString::fromUTF8(registration_id)));
|
| + new blink::WebPushSubscription(endpoint));
|
| callbacks->onSuccess(subscription.release());
|
|
|
| subscription_callbacks_.Remove(request_id);
|
|
|