Index: Source/modules/credentialmanager/NavigatorCredentials.cpp |
diff --git a/Source/modules/credentialmanager/NavigatorCredentials.cpp b/Source/modules/credentialmanager/NavigatorCredentials.cpp |
index 1138ce0e25b83a80f5f95198b6e6004d90ac4bd6..304f5c8819f6d97c38b9e6eb78a1533512904556 100644 |
--- a/Source/modules/credentialmanager/NavigatorCredentials.cpp |
+++ b/Source/modules/credentialmanager/NavigatorCredentials.cpp |
@@ -18,14 +18,16 @@ NavigatorCredentials::NavigatorCredentials(Navigator& navigator) |
{ |
} |
-DEFINE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(NavigatorCredentials); |
+NavigatorCredentials::~NavigatorCredentials() |
+{ |
+} |
NavigatorCredentials& NavigatorCredentials::from(Navigator& navigator) |
{ |
- NavigatorCredentials* supplement = static_cast<NavigatorCredentials*>(WillBeHeapSupplement<Navigator>::from(navigator, supplementName())); |
+ NavigatorCredentials* supplement = static_cast<NavigatorCredentials*>(HeapSupplement<Navigator>::from(navigator, supplementName())); |
if (!supplement) { |
supplement = new NavigatorCredentials(navigator); |
- provideTo(navigator, supplementName(), adoptPtrWillBeNoop(supplement)); |
+ provideTo(navigator, supplementName(), supplement); |
} |
return *supplement; |
} |
@@ -50,7 +52,7 @@ CredentialsContainer* NavigatorCredentials::credentials() |
DEFINE_TRACE(NavigatorCredentials) |
{ |
visitor->trace(m_credentialsContainer); |
- WillBeHeapSupplement<Navigator>::trace(visitor); |
+ HeapSupplement<Navigator>::trace(visitor); |
DOMWindowProperty::trace(visitor); |
} |