Move MediaQuery classes off BlinkGC heap

third_party/WebKit/Source/core/css/MediaQuery.h

 /*
  * CSS Media Query
  *
  * Copyright (C) 2006 Kimmo Kinnunen <kimmo.t.kinnunen@nokia.com>.
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
  *
  * 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
@@ skipping 21 matching lines @@
 #include "core/CoreExport.h"
 #include "platform/heap/Handle.h"
 #include "wtf/Vector.h"
 #include "wtf/text/StringHash.h"
 #include "wtf/text/WTFString.h"
 #include <utility>
 
 namespace blink {
 class MediaQueryExp;
 
-using ExpressionHeapVector = HeapVector<Member<MediaQueryExp>>;
+using ExpressionHeapVector = Vector<MediaQueryExp>;
 
-class CORE_EXPORT MediaQuery : public GarbageCollectedFinalized<MediaQuery> {
+class CORE_EXPORT MediaQuery {
  public:
   enum RestrictorType { Only, Not, None };
 
-  static MediaQuery* create(RestrictorType,
-                            String mediaType,
-                            ExpressionHeapVector);
-  static MediaQuery* createNotAll();
+  static std::unique_ptr<MediaQuery> create(RestrictorType,
+                                            String mediaType,
+                                            ExpressionHeapVector);
+  static std::unique_ptr<MediaQuery> createNotAll();
 
+  MediaQuery(RestrictorType, String media_type, ExpressionHeapVector);
+  MediaQuery(const MediaQuery&);
   ~MediaQuery();
 
   RestrictorType restrictor() const { return m_restrictor; }
   const ExpressionHeapVector& expressions() const { return m_expressions; }
   const String& mediaType() const { return m_mediaType; }
   bool operator==(const MediaQuery& other) const;
   String cssText() const;
 
-  MediaQuery* copy() const { return new MediaQuery(*this); }
+  std::unique_ptr<MediaQuery> copy() const {
+    return WTF::makeUnique<MediaQuery>(*this);
+  }
 
   DECLARE_TRACE();
 
  private:
-  MediaQuery(RestrictorType, String mediaType, ExpressionHeapVector);
-  MediaQuery(const MediaQuery&);
-
   MediaQuery& operator=(const MediaQuery&) = delete;
 
   RestrictorType m_restrictor;
   String m_mediaType;
   ExpressionHeapVector m_expressions;
   String m_serializationCache;
 
   String serialize() const;
 };
 
 }  // namespace blink
 
 #endif