| Index: third_party/WebKit/Source/core/inspector/InjectedScriptManager.cpp
|
| diff --git a/third_party/WebKit/Source/core/inspector/InjectedScriptManager.cpp b/third_party/WebKit/Source/core/inspector/InjectedScriptManager.cpp
|
| index c34abced73bac8f246d1aa09f8eca53761ccf67a..904413fe80a435d034d8c485697d0eb8ef72d2e3 100644
|
| --- a/third_party/WebKit/Source/core/inspector/InjectedScriptManager.cpp
|
| +++ b/third_party/WebKit/Source/core/inspector/InjectedScriptManager.cpp
|
| @@ -42,14 +42,14 @@
|
|
|
| namespace blink {
|
|
|
| -PassOwnPtrWillBeRawPtr<InjectedScriptManager> InjectedScriptManager::createForPage()
|
| +PassOwnPtr<InjectedScriptManager> InjectedScriptManager::createForPage()
|
| {
|
| - return adoptPtrWillBeNoop(new InjectedScriptManager(&InjectedScriptManager::canAccessInspectedWindow));
|
| + return adoptPtr(new InjectedScriptManager(&InjectedScriptManager::canAccessInspectedWindow));
|
| }
|
|
|
| -PassOwnPtrWillBeRawPtr<InjectedScriptManager> InjectedScriptManager::createForWorker()
|
| +PassOwnPtr<InjectedScriptManager> InjectedScriptManager::createForWorker()
|
| {
|
| - return adoptPtrWillBeNoop(new InjectedScriptManager(&InjectedScriptManager::canAccessInspectedWorkerGlobalScope));
|
| + return adoptPtr(new InjectedScriptManager(&InjectedScriptManager::canAccessInspectedWorkerGlobalScope));
|
| }
|
|
|
| InjectedScriptManager::InjectedScriptManager(InspectedStateAccessCheck accessCheck)
|
| @@ -63,11 +63,6 @@ InjectedScriptManager::~InjectedScriptManager()
|
| {
|
| }
|
|
|
| -DEFINE_TRACE(InjectedScriptManager)
|
| -{
|
| - visitor->trace(m_injectedScriptHost);
|
| -}
|
| -
|
| void InjectedScriptManager::disconnect()
|
| {
|
| m_injectedScriptHost->disconnect();
|
|
|