Replace scoped_ptr with unique_ptr in webrtc/base/

webrtc/base/testutils.h

 /*
  *  Copyright 2004 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.
  */
 
 #ifndef WEBRTC_BASE_TESTUTILS_H__
 #define WEBRTC_BASE_TESTUTILS_H__
 
 // Utilities for testing rtc infrastructure in unittests
 
 #if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID)
 #include <X11/Xlib.h>
 #include <X11/extensions/Xrandr.h>
 
 // X defines a few macros that stomp on types that gunit.h uses.
 #undef None
 #undef Bool
 #endif
 
 #include <algorithm>
 #include <map>
+#include <memory>
 #include <vector>
 #include "webrtc/base/arraysize.h"
 #include "webrtc/base/asyncsocket.h"
 #include "webrtc/base/common.h"
 #include "webrtc/base/gunit.h"
 #include "webrtc/base/nethelpers.h"
 #include "webrtc/base/pathutils.h"
 #include "webrtc/base/stream.h"
 #include "webrtc/base/stringencode.h"
 #include "webrtc/base/stringutils.h"
@@ skipping 327 matching lines @@
     }
   }
   void OnWriteEvent(AsyncSocket* socket) {
     if (!send_buffer_.empty()) {
       Flush();
     }
   }
   void OnCloseEvent(AsyncSocket* socket, int error) {
   }
 
-  scoped_ptr<AsyncSocket> socket_;
+  std::unique_ptr<AsyncSocket> socket_;
   Buffer send_buffer_, recv_buffer_;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 // SocketTestServer
 // Creates a simulated server for testing.  Works on real and virtual networks.
 ///////////////////////////////////////////////////////////////////////////////
 
 class SocketTestServer : public sigslot::has_slots<> {
  public:
@@ skipping 22 matching lines @@
 
  private:
   void OnReadEvent(AsyncSocket* socket) {
     AsyncSocket* accepted =
       static_cast<AsyncSocket*>(socket_->Accept(NULL));
     if (!accepted)
       return;
     clients_.push_back(new SocketTestClient(accepted));
   }
 
-  scoped_ptr<AsyncSocket> socket_;
+  std::unique_ptr<AsyncSocket> socket_;
   std::vector<SocketTestClient*> clients_;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 // Generic Utilities
 ///////////////////////////////////////////////////////////////////////////////
 
 inline bool ReadFile(const char* filename, std::string* contents) {
   FILE* fp = fopen(filename, "rb");
   if (!fp)
@@ skipping 198 matching lines @@
                     << minor_version;
     LOG(LS_WARNING) << "XRandr is not supported or is too old (pre 1.3).";
     return false;
   }
 #endif
   return true;
 }
 }  // namespace testing
 
 #endif  // WEBRTC_BASE_TESTUTILS_H__