Use a new Supplement construtor in PagePopupController

third_party/WebKit/Source/core/page/PagePopupSupplement.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 16 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "core/page/PagePopupSupplement.h"
 
 #include "core/page/PagePopupController.h"
 
 namespace blink {
 
-PagePopupSupplement::PagePopupSupplement(PagePopup& popup,
+PagePopupSupplement::PagePopupSupplement(LocalFrame& frame,
+                                         PagePopup& popup,
                                          PagePopupClient* popupClient)
-    : m_controller(PagePopupController::create(popup, popupClient)) {
-  ASSERT(popupClient);
+    : Supplement<LocalFrame>(frame),
+      m_controller(PagePopupController::create(popup, popupClient)) {
+  DCHECK(popupClient);
 }
 
 const char* PagePopupSupplement::supplementName() {
   return "PagePopupSupplement";
 }
 
-PagePopupController* PagePopupSupplement::pagePopupController(
-    LocalFrame& frame) {
-  PagePopupSupplement* supplement =
-      static_cast<PagePopupSupplement*>(from(&frame, supplementName()));
-  ASSERT(supplement);
-  return supplement->m_controller.get();
+PagePopupSupplement& PagePopupSupplement::from(LocalFrame& frame) {
+  PagePopupSupplement* supplement = static_cast<PagePopupSupplement*>(
+      Supplement<LocalFrame>::from(&frame, supplementName()));
+  DCHECK(supplement);
+  return *supplement;
+}
+
+PagePopupController* PagePopupSupplement::pagePopupController() const {
+  return m_controller;
+}
+
+void PagePopupSupplement::dispose() {
+  m_controller->clearPagePopupClient();
 }
 
 void PagePopupSupplement::install(LocalFrame& frame,
                                   PagePopup& popup,
                                   PagePopupClient* popupClient) {
   ASSERT(popupClient);
   provideTo(frame, supplementName(),
-            new PagePopupSupplement(popup, popupClient));
+            new PagePopupSupplement(frame, popup, popupClient));
 }
 
 void PagePopupSupplement::uninstall(LocalFrame& frame) {
-  pagePopupController(frame)->clearPagePopupClient();
+  PagePopupSupplement::from(frame).dispose();
   frame.removeSupplement(supplementName());
 }
 
 DEFINE_TRACE(PagePopupSupplement) {
   visitor->trace(m_controller);
   Supplement<LocalFrame>::trace(visitor);
 }
 
 }  // namespace blink