[blink] Unique pointers in Platform.h

third_party/WebKit/Source/platform/heap/HeapTest.cpp

 /*
  * Copyright (C) 2013 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 452 matching lines @@
 };
 
 int IntWrapper::destructor_calls_ = 0;
 int OffHeapInt::destructor_calls_ = 0;
 
 class ThreadedTesterBase {
  protected:
   static void Test(ThreadedTesterBase* tester) {
     Vector<std::unique_ptr<WebThread>, kNumberOfThreads> threads;
     for (int i = 0; i < kNumberOfThreads; i++) {
-      threads.push_back(WTF::WrapUnique(
-          Platform::Current()->CreateThread("blink gc testing thread")));
+      threads.push_back(
+          Platform::Current()->CreateThread("blink gc testing thread"));
       threads.back()->GetWebTaskRunner()->PostTask(
           BLINK_FROM_HERE,
           CrossThreadBind(ThreadFunc, CrossThreadUnretained(tester)));
     }
     while (tester->threads_to_finish_) {
       testing::YieldCurrentThread();
     }
     delete tester;
   }
 
@@ skipping 4940 matching lines @@
   MutexLocker locker(WorkerThreadMutex());
   WorkerThreadCondition().Signal();
 }
 
 class ThreadedStrongificationTester {
  public:
   static void Test() {
     IntWrapper::destructor_calls_ = 0;
 
     MutexLocker locker(MainThreadMutex());
-    std::unique_ptr<WebThread> worker_thread = WTF::WrapUnique(
-        Platform::Current()->CreateThread("Test Worker Thread"));
+    std::unique_ptr<WebThread> worker_thread =
+        Platform::Current()->CreateThread("Test Worker Thread");
     worker_thread->GetWebTaskRunner()->PostTask(
         BLINK_FROM_HERE, CrossThreadBind(WorkerThreadMain));
 
     // Wait for the worker thread initialization. The worker
     // allocates a weak collection where both collection and
     // contents are kept alive via persistent pointers.
     ParkMainThread();
 
     // Perform two garbage collections where the worker thread does
     // not wake up in between. This will cause us to remove marks
@@ skipping 77 matching lines @@
 TEST(HeapTest, ThreadedStrongification) {
   ThreadedStrongificationTester::Test();
 }
 
 class MemberSameThreadCheckTester {
  public:
   void Test() {
     IntWrapper::destructor_calls_ = 0;
 
     MutexLocker locker(MainThreadMutex());
-    std::unique_ptr<WebThread> worker_thread = WTF::WrapUnique(
-        Platform::Current()->CreateThread("Test Worker Thread"));
+    std::unique_ptr<WebThread> worker_thread =
+        Platform::Current()->CreateThread("Test Worker Thread");
     worker_thread->GetWebTaskRunner()->PostTask(
         BLINK_FROM_HERE,
         CrossThreadBind(&MemberSameThreadCheckTester::WorkerThreadMain,
                         CrossThreadUnretained(this)));
 
     ParkMainThread();
   }
 
  private:
   Member<IntWrapper> wrapper_;
@@ skipping 21 matching lines @@
 }
 #endif
 #endif
 
 class PersistentSameThreadCheckTester {
  public:
   void Test() {
     IntWrapper::destructor_calls_ = 0;
 
     MutexLocker locker(MainThreadMutex());
-    std::unique_ptr<WebThread> worker_thread = WTF::WrapUnique(
-        Platform::Current()->CreateThread("Test Worker Thread"));
+    std::unique_ptr<WebThread> worker_thread =
+        Platform::Current()->CreateThread("Test Worker Thread");
     worker_thread->GetWebTaskRunner()->PostTask(
         BLINK_FROM_HERE,
         CrossThreadBind(&PersistentSameThreadCheckTester::WorkerThreadMain,
                         CrossThreadUnretained(this)));
 
     ParkMainThread();
   }
 
  private:
   Persistent<IntWrapper> wrapper_;
@@ skipping 21 matching lines @@
 }
 #endif
 #endif
 
 class MarkingSameThreadCheckTester {
  public:
   void Test() {
     IntWrapper::destructor_calls_ = 0;
 
     MutexLocker locker(MainThreadMutex());
-    std::unique_ptr<WebThread> worker_thread = WTF::WrapUnique(
-        Platform::Current()->CreateThread("Test Worker Thread"));
+    std::unique_ptr<WebThread> worker_thread =
+        Platform::Current()->CreateThread("Test Worker Thread");
     Persistent<MainThreadObject> main_thread_object = new MainThreadObject();
     worker_thread->GetWebTaskRunner()->PostTask(
         BLINK_FROM_HERE,
         CrossThreadBind(&MarkingSameThreadCheckTester::WorkerThreadMain,
                         CrossThreadUnretained(this),
                         WrapCrossThreadPersistent(main_thread_object.Get())));
     ParkMainThread();
     // This will try to mark MainThreadObject when it tries to mark IntWrapper
     // it should crash.
     PreciselyCollectGarbage();
@@ skipping 766 matching lines @@
   // pointing to it on the main thread, clear the reference in the worker
   // thread, run a GC in the worker thread, and see if the
   // CrossThreadWeakPersistent is cleared.
 
   DestructorLockingObject::destructor_calls_ = 0;
 
   // Step 1: Initiate a worker thread, and wait for |object| to get allocated on
   // the worker thread.
   MutexLocker main_thread_mutex_locker(MainThreadMutex());
   std::unique_ptr<WebThread> worker_thread =
-      WTF::WrapUnique(Platform::Current()->CreateThread("Test Worker Thread"));
+      Platform::Current()->CreateThread("Test Worker Thread");
   DestructorLockingObject* object = nullptr;
   worker_thread->GetWebTaskRunner()->PostTask(
       BLINK_FROM_HERE,
       CrossThreadBind(WorkerThreadMainForCrossThreadWeakPersistentTest,
                       CrossThreadUnretained(&object)));
   ParkMainThread();
 
   // Step 3: Set up a CrossThreadWeakPersistent.
   ASSERT_TRUE(object);
   CrossThreadWeakPersistent<DestructorLockingObject>
@@ skipping 279 matching lines @@
     map.insert(key, IntWrapper::Create(i));
   }
 
   EXPECT_FALSE(string.Impl()->HasOneRef());
   map.clear();
 
   EXPECT_TRUE(string.Impl()->HasOneRef());
 }
 
 }  // namespace blink