Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/core/dom/ContextFeatures.h

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Neither the name of Google Inc. nor the names of its
@@ skipping 12 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef ContextFeatures_h
 #define ContextFeatures_h
 
 #include "core/CoreExport.h"
 #include "core/page/Page.h"
 #include "platform/heap/Handle.h"
-#include <memory>
 
 namespace blink {
 
 class ContextFeaturesClient;
 class Document;
 class Page;
 
 class ContextFeatures final : public GarbageCollectedFinalized<ContextFeatures>, public Supplement<Page> {
     USING_GARBAGE_COLLECTED_MIXIN(ContextFeatures);
 public:
     enum FeatureType {
         PagePopup = 0,
         MutationEvents,
         FeatureTypeSize // Should be the last entry.
     };
 
     static const char* supplementName();
     static ContextFeatures& defaultSwitch();
-    static ContextFeatures* create(std::unique_ptr<ContextFeaturesClient>);
+    static ContextFeatures* create(PassOwnPtr<ContextFeaturesClient>);
 
     static bool pagePopupEnabled(Document*);
     static bool mutationEventsEnabled(Document*);
 
     bool isEnabled(Document*, FeatureType, bool) const;
     void urlDidChange(Document*);
 
 private:
-    explicit ContextFeatures(std::unique_ptr<ContextFeaturesClient> client)
+    explicit ContextFeatures(PassOwnPtr<ContextFeaturesClient> client)
         : m_client(std::move(client))
     { }
 
-    std::unique_ptr<ContextFeaturesClient> m_client;
+    OwnPtr<ContextFeaturesClient> m_client;
 };
 
 class ContextFeaturesClient {
     USING_FAST_MALLOC(ContextFeaturesClient);
 public:
-    static std::unique_ptr<ContextFeaturesClient> empty();
+    static PassOwnPtr<ContextFeaturesClient> empty();
 
     virtual ~ContextFeaturesClient() { }
     virtual bool isEnabled(Document*, ContextFeatures::FeatureType, bool defaultValue) { return defaultValue; }
     virtual void urlDidChange(Document*) { }
 };
 
-CORE_EXPORT void provideContextFeaturesTo(Page&, std::unique_ptr<ContextFeaturesClient>);
+CORE_EXPORT void provideContextFeaturesTo(Page&, PassOwnPtr<ContextFeaturesClient>);
 void provideContextFeaturesToDocumentFrom(Document&, Page&);
 
-inline ContextFeatures* ContextFeatures::create(std::unique_ptr<ContextFeaturesClient> client)
+inline ContextFeatures* ContextFeatures::create(PassOwnPtr<ContextFeaturesClient> client)
 {
     return new ContextFeatures(std::move(client));
 }
 
 inline bool ContextFeatures::isEnabled(Document* document, FeatureType type, bool defaultValue) const
 {
     if (!m_client)
         return defaultValue;
     return m_client->isEnabled(document, type, defaultValue);
 }
 
 inline void ContextFeatures::urlDidChange(Document* document)
 {
     // FIXME: The original code, commented out below, is obviously
     // wrong, but the seemingly correct fix of negating the test to
     // the more logical 'if (!m_client)' crashes the renderer.
     // See issue 294180
     //
     // if (m_client)
     //     return;
     // m_client->urlDidChange(document);
 }
 
 } // namespace blink
 
 #endif // ContextFeatures_h