Remove calls to ScopedToUnique and UniqueToScoped

webrtc/modules/audio_device/test/func_test_manager.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 576 matching lines @@
   _playoutFile8 = webrtc::test::ResourcePath("audio_device\\audio_short8",
                                              "pcm");
 }
 
 FuncTestManager::~FuncTestManager()
 {
 }
 
 int32_t FuncTestManager::Init()
 {
-    EXPECT_TRUE((_processThread = rtc::ScopedToUnique(
-                     ProcessThread::Create("ProcessThread"))) != NULL);
-    if (_processThread == NULL)
-    {
-        return -1;
+    EXPECT_TRUE((_processThread = ProcessThread::Create("ProcessThread")) !=
+                NULL);
+    if (_processThread == NULL) {
+      return -1;
     }
     _processThread->Start();
 
     // create the Audio Device module
     EXPECT_TRUE((_audioDevice = AudioDeviceModuleImpl::Create(
         555, ADM_AUDIO_LAYER)) != NULL);
     if (_audioDevice == NULL)
     {
         return -1;
     }
@@ skipping 213 matching lines @@
         // release the AudioDeviceModule object
         if (_audioDevice)
         {
             EXPECT_EQ(0, _audioDevice->Release());
             _audioDevice = NULL;
         }
 
         // ==================================================
         // Next, try to make fresh start with new audio layer
 
-        EXPECT_TRUE((_processThread = rtc::ScopedToUnique(
-                         ProcessThread::Create("ProcessThread"))) != NULL);
+        EXPECT_TRUE((_processThread = ProcessThread::Create("ProcessThread")) !=
+                    NULL);
         if (_processThread == NULL)
         {
             return -1;
         }
         _processThread->Start();
 
         // create the Audio Device module based on selected audio layer
         if (tryWinWave)
         {
             _audioDevice = AudioDeviceModuleImpl::Create(
@@ skipping 1891 matching lines @@
 
     TEST_LOG("\n");
     PRINT_TEST_RESULTS;
 
     return 0;
 }
 
 }  // namespace webrtc
 
 // EOF