Revert "Remove OwnPtr from Blink."

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

 /*
  * Copyright (C) 2006, 2007 Apple Inc. All rights reserved.
  * Copyright (C) 2010 Igalia S.L
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 21 matching lines @@
 #include "core/events/MouseEvent.h"
 #include "core/events/RelatedEvent.h"
 #include "core/frame/LocalFrame.h"
 #include "core/html/HTMLMenuElement.h"
 #include "core/input/EventHandler.h"
 #include "core/page/ContextMenuClient.h"
 #include "core/page/ContextMenuProvider.h"
 #include "core/page/CustomContextMenuProvider.h"
 #include "platform/ContextMenu.h"
 #include "platform/ContextMenuItem.h"
-#include "wtf/PtrUtil.h"
-#include <memory>
 
 namespace blink {
 
 using namespace HTMLNames;
 
 ContextMenuController::ContextMenuController(Page*, ContextMenuClient* client)
     : m_client(client)
 {
     DCHECK(client);
 }
@@ skipping 85 matching lines @@
     m_contextMenu = createContextMenu(frame, location);
     if (!m_contextMenu) {
         clearContextMenu();
         return;
     }
 
     m_menuProvider->populateContextMenu(m_contextMenu.get());
     showContextMenu(nullptr);
 }
 
-std::unique_ptr<ContextMenu> ContextMenuController::createContextMenu(Event* event)
+PassOwnPtr<ContextMenu> ContextMenuController::createContextMenu(Event* event)
 {
     ASSERT(event);
 
     if (!event->isMouseEvent())
         return nullptr;
 
     MouseEvent* mouseEvent = toMouseEvent(event);
     return createContextMenu(event->target()->toNode()->document().frame(), mouseEvent->absoluteLocation());
 }
 
-std::unique_ptr<ContextMenu> ContextMenuController::createContextMenu(LocalFrame* frame, const LayoutPoint& location)
+PassOwnPtr<ContextMenu> ContextMenuController::createContextMenu(LocalFrame* frame, const LayoutPoint& location)
 {
     HitTestRequest::HitTestRequestType type = HitTestRequest::ReadOnly | HitTestRequest::Active;
     HitTestResult result(type, location);
 
     if (frame)
         result = frame->eventHandler().hitTestResultAtPoint(location, type);
 
     if (!result.innerNodeOrImageMapImage())
         return nullptr;
 
     m_hitTestResult = result;
 
-    return wrapUnique(new ContextMenu);
+    return adoptPtr(new ContextMenu);
 }
 
 void ContextMenuController::showContextMenu(Event* event)
 {
     bool fromTouch = false;
     if (event && event->isMouseEvent()) {
         MouseEvent* mouseEvent = static_cast<MouseEvent*>(event);
         fromTouch = mouseEvent->fromTouch();
     }
 
     if (m_client->showContextMenu(m_contextMenu.get(), fromTouch) && event)
         event->setDefaultHandled();
 }
 
 void ContextMenuController::contextMenuItemSelected(const ContextMenuItem* item)
 {
     ASSERT(item->type() == ActionType || item->type() == CheckableActionType);
 
     if (item->action() < ContextMenuItemBaseCustomTag || item->action() > ContextMenuItemLastCustomTag)
         return;
 
     ASSERT(m_menuProvider);
     m_menuProvider->contextMenuItemSelected(item);
 }
 
 } // namespace blink