Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/platform/EventTracer.cpp

 /*
  * Copyright (C) 2011 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.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 19 matching lines @@
 
 #include "platform/EventTracer.h"
 
 #include "base/time/time.h"
 #include "base/trace_event/trace_event.h"
 #include "base/trace_event/trace_event_argument.h"
 #include "platform/TracedValue.h"
 #include "public/platform/Platform.h"
 #include "wtf/Assertions.h"
 #include "wtf/text/StringUTF8Adaptor.h"
-#include <memory>
 #include <stdio.h>
 
 namespace blink {
 
 static_assert(sizeof(TraceEvent::TraceEventHandle) == sizeof(base::trace_event::TraceEventHandle), "TraceEventHandle types must be the same");
 static_assert(sizeof(TraceEvent::TraceEventAPIAtomicWord) == sizeof(const char*), "TraceEventAPIAtomicWord must be pointer-sized.");
 
 // The dummy variable is needed to avoid a crash when someone updates the state variables
 // before EventTracer::initialize() is called.
 TraceEvent::TraceEventAPIAtomicWord dummyTraceSamplingState = 0;
@@ skipping 15 matching lines @@
 
 const unsigned char* EventTracer::getTraceCategoryEnabledFlag(const char* categoryName)
 {
     return TRACE_EVENT_API_GET_CATEGORY_GROUP_ENABLED(categoryName);
 }
 
 TraceEvent::TraceEventHandle EventTracer::addTraceEvent(char phase, const unsigned char* categoryEnabledFlag,
     const char* name, const char* scope, unsigned long long id, unsigned long long bindId, double timestamp,
     int numArgs, const char* argNames[], const unsigned char argTypes[],
     const unsigned long long argValues[],
-    std::unique_ptr<TracedValue> tracedValue1,
-    std::unique_ptr<TracedValue> tracedValue2,
+    PassOwnPtr<TracedValue> tracedValue1,
+    PassOwnPtr<TracedValue> tracedValue2,
     unsigned flags)
 {
     std::unique_ptr<base::trace_event::ConvertableToTraceFormat> convertables[2];
     ASSERT(numArgs <= 2);
     // We move m_tracedValues from TracedValues for thread safety.
     // https://crbug.com/478149
     if (numArgs >= 1 && argTypes[0] == TRACE_VALUE_TYPE_CONVERTABLE)
         convertables[0] = std::move(tracedValue1->m_tracedValue);
     if (numArgs >= 2 && argTypes[1] == TRACE_VALUE_TYPE_CONVERTABLE)
         convertables[1] = std::move(tracedValue2->m_tracedValue);
@@ skipping 26 matching lines @@
     memcpy(&traceEventHandle, &handle, sizeof(handle));
     TRACE_EVENT_API_UPDATE_TRACE_EVENT_DURATION(categoryEnabledFlag, name, traceEventHandle);
 }
 
 double EventTracer::systemTraceTime()
 {
     return (base::TimeTicks::Now() - base::TimeTicks()).InSecondsF();
 }
 
 } // namespace blink