Index: Source/modules/push_messaging/PushController.cpp |
diff --git a/Source/modules/push_messaging/PushController.cpp b/Source/modules/push_messaging/PushController.cpp |
index 838e55459976be1191eb0de434250b1a28df49b7..914aa3ff8e28a83e41f85fa5e91639151757a15d 100644 |
--- a/Source/modules/push_messaging/PushController.cpp |
+++ b/Source/modules/push_messaging/PushController.cpp |
@@ -20,11 +20,13 @@ PassOwnPtrWillBeRawPtr<PushController> PushController::create(WebPushClient* cli |
return adoptPtrWillBeNoop(new PushController(client)); |
} |
-WebPushClient* PushController::clientFrom(LocalFrame* frame) |
+WebPushClient& PushController::clientFrom(LocalFrame* frame) |
{ |
- if (PushController* controller = PushController::from(frame)) |
- return controller->client(); |
- return 0; |
+ PushController* controller = PushController::from(frame); |
+ ASSERT(controller); |
+ WebPushClient* client = controller->client(); |
+ ASSERT(client); |
+ return *client; |
} |
const char* PushController::supplementName() |