Remove OwnPtr from Blink.

third_party/WebKit/Source/bindings/core/v8/DOMWrapperWorld.cpp

Index: third_party/WebKit/Source/bindings/core/v8/DOMWrapperWorld.cpp
diff --git a/third_party/WebKit/Source/bindings/core/v8/DOMWrapperWorld.cpp b/third_party/WebKit/Source/bindings/core/v8/DOMWrapperWorld.cpp
index ee0a071fdb4d3f8c898fa86667c8298bd053ebd6..40a6326e392b07b5befca4b69a8c6934b6e4b516 100644
--- a/third_party/WebKit/Source/bindings/core/v8/DOMWrapperWorld.cpp
+++ b/third_party/WebKit/Source/bindings/core/v8/DOMWrapperWorld.cpp
@@ -40,7 +40,9 @@
 #include "bindings/core/v8/WrapperTypeInfo.h"
 #include "core/dom/ExecutionContext.h"
 #include "wtf/HashTraits.h"
+#include "wtf/PtrUtil.h"
 #include "wtf/StdLibExtras.h"
+#include <memory>

[tkent, 2016/06/14 02:23:47]

You don't need to include <memory> if the primary header, DOMWrapperWorld.h
includes <memory>.

https://google.github.io/styleguide/cppguide.html#Names_and_Order_of_Includes

[Yuta Kitamura, 2016/06/14 04:44:43]

I know, but the automatic #include handling was already
too complex and decided to go with the current manner
(#include whatever used in the file). I assume that's
allowed and harmless.

The complication around #include was:
* Various #include forms (e.g. some include the primary
  header first, some not)
* Detection of primary header (e.g. Xxxx.h is the primary
  header for XxxxMac.cpp; we even have files named like
  chromium_style.cc)
* #include guarded with #if
* etc.

 
 namespace blink {
 
@@ -69,9 +71,9 @@ private:
 template<typename T>
 class DOMObjectHolder : public DOMObjectHolderBase {
 public:
-    static PassOwnPtr<DOMObjectHolder<T>> create(v8::Isolate* isolate, T* object, v8::Local<v8::Value> wrapper)
+    static std::unique_ptr<DOMObjectHolder<T>> create(v8::Isolate* isolate, T* object, v8::Local<v8::Value> wrapper)
     {
-        return adoptPtr(new DOMObjectHolder(isolate, object, wrapper));
+        return wrapUnique(new DOMObjectHolder(isolate, object, wrapper));
     }
 
 private:
@@ -94,7 +96,7 @@ PassRefPtr<DOMWrapperWorld> DOMWrapperWorld::create(v8::Isolate* isolate, int wo
 DOMWrapperWorld::DOMWrapperWorld(v8::Isolate* isolate, int worldId, int extensionGroup)
     : m_worldId(worldId)
     , m_extensionGroup(extensionGroup)
-    , m_domDataStore(adoptPtr(new DOMDataStore(isolate, isMainWorld())))
+    , m_domDataStore(wrapUnique(new DOMDataStore(isolate, isMainWorld())))
 {
 }
 
@@ -305,7 +307,7 @@ void DOMWrapperWorld::registerDOMObjectHolder(v8::Isolate* isolate, T* object, v
 
 template void DOMWrapperWorld::registerDOMObjectHolder(v8::Isolate*, ScriptFunction*, v8::Local<v8::Value>);
 
-void DOMWrapperWorld::registerDOMObjectHolderInternal(PassOwnPtr<DOMObjectHolderBase> holderBase)
+void DOMWrapperWorld::registerDOMObjectHolderInternal(std::unique_ptr<DOMObjectHolderBase> holderBase)
 {
     ASSERT(!m_domObjectHolders.contains(holderBase.get()));
     holderBase->setWorld(this);