Index: third_party/WebKit/Source/core/inspector/ThreadDebugger.cpp |
diff --git a/third_party/WebKit/Source/core/inspector/ThreadDebugger.cpp b/third_party/WebKit/Source/core/inspector/ThreadDebugger.cpp |
index abb5fe4cc6e4c4edd23046e5ad0510f0456b7815..1de42b5dbe05252a1a8eacf5bbf03ba6b9cb6ec5 100644 |
--- a/third_party/WebKit/Source/core/inspector/ThreadDebugger.cpp |
+++ b/third_party/WebKit/Source/core/inspector/ThreadDebugger.cpp |
@@ -22,8 +22,7 @@ |
#include "core/inspector/ScriptArguments.h" |
#include "platform/ScriptForbiddenScope.h" |
#include "wtf/CurrentTime.h" |
-#include "wtf/PtrUtil.h" |
-#include <memory> |
+#include "wtf/OwnPtr.h" |
namespace blink { |
@@ -67,7 +66,7 @@ void ThreadDebugger::idleFinished(v8::Isolate* isolate) |
void ThreadDebugger::beginUserGesture() |
{ |
- m_userGestureIndicator = wrapUnique(new UserGestureIndicator(DefinitelyProcessingNewUserGesture)); |
+ m_userGestureIndicator = adoptPtr(new UserGestureIndicator(DefinitelyProcessingNewUserGesture)); |
} |
void ThreadDebugger::endUserGesture() |
@@ -323,7 +322,7 @@ void ThreadDebugger::startRepeatingTimer(double interval, V8DebuggerClient::Time |
m_timerData.append(data); |
m_timerCallbacks.append(callback); |
- std::unique_ptr<Timer<ThreadDebugger>> timer = wrapUnique(new Timer<ThreadDebugger>(this, &ThreadDebugger::onTimer)); |
+ OwnPtr<Timer<ThreadDebugger>> timer = adoptPtr(new Timer<ThreadDebugger>(this, &ThreadDebugger::onTimer)); |
Timer<ThreadDebugger>* timerPtr = timer.get(); |
m_timers.append(std::move(timer)); |
timerPtr->startRepeating(interval, BLINK_FROM_HERE); |
@@ -345,7 +344,7 @@ void ThreadDebugger::cancelTimer(void* data) |
void ThreadDebugger::onTimer(Timer<ThreadDebugger>* timer) |
{ |
for (size_t index = 0; index < m_timers.size(); ++index) { |
- if (m_timers[index].get() == timer) { |
+ if (m_timers[index] == timer) { |
m_timerCallbacks[index](m_timerData[index]); |
return; |
} |