| Index: net/tools/flip_server/spdy_interface_test.cc
 | 
| diff --git a/net/tools/flip_server/spdy_interface_test.cc b/net/tools/flip_server/spdy_interface_test.cc
 | 
| index dc172fcd633620508ede3c535ba609a51b28cc41..e5e7dd93342135891ab2d2e3ae681afa7daa3fda 100644
 | 
| --- a/net/tools/flip_server/spdy_interface_test.cc
 | 
| +++ b/net/tools/flip_server/spdy_interface_test.cc
 | 
| @@ -5,8 +5,8 @@
 | 
|  #include "net/tools/flip_server/spdy_interface.h"
 | 
|  
 | 
|  #include <list>
 | 
| +#include <memory>
 | 
|  
 | 
| -#include "base/memory/scoped_ptr.h"
 | 
|  #include "base/strings/string_piece.h"
 | 
|  #include "net/spdy/buffered_spdy_framer.h"
 | 
|  #include "net/tools/balsa/balsa_enums.h"
 | 
| @@ -194,14 +194,14 @@ class SpdySMTestBase : public ::testing::TestWithParam<SpdyMajorVersion> {
 | 
|    }
 | 
|  
 | 
|   protected:
 | 
| -  scoped_ptr<MockSMInterface> mock_another_interface_;
 | 
| -  scoped_ptr<MemoryCache> memory_cache_;
 | 
| -  scoped_ptr<FlipAcceptor> acceptor_;
 | 
| -  scoped_ptr<EpollServer> epoll_server_;
 | 
| -  scoped_ptr<FakeSMConnection> connection_;
 | 
| -  scoped_ptr<TestSpdySM> interface_;
 | 
| -  scoped_ptr<BufferedSpdyFramer> spdy_framer_;
 | 
| -  scoped_ptr<SpdyFramerVisitor> spdy_framer_visitor_;
 | 
| +  std::unique_ptr<MockSMInterface> mock_another_interface_;
 | 
| +  std::unique_ptr<MemoryCache> memory_cache_;
 | 
| +  std::unique_ptr<FlipAcceptor> acceptor_;
 | 
| +  std::unique_ptr<EpollServer> epoll_server_;
 | 
| +  std::unique_ptr<FakeSMConnection> connection_;
 | 
| +  std::unique_ptr<TestSpdySM> interface_;
 | 
| +  std::unique_ptr<BufferedSpdyFramer> spdy_framer_;
 | 
| +  std::unique_ptr<SpdyFramerVisitor> spdy_framer_visitor_;
 | 
|  };
 | 
|  
 | 
|  class SpdySMProxyTest : public SpdySMTestBase {
 | 
| @@ -230,13 +230,13 @@ TEST_P(SpdySMProxyTest, InitSMConnection) {
 | 
|  
 | 
|  TEST_P(SpdySMProxyTest, OnStreamFrameData) {
 | 
|    BufferedSpdyFramerVisitorInterface* visitor = interface_.get();
 | 
| -  scoped_ptr<MockSMInterface> mock_interface(new MockSMInterface);
 | 
| +  std::unique_ptr<MockSMInterface> mock_interface(new MockSMInterface);
 | 
|    uint32_t stream_id = 92;
 | 
|    uint32_t associated_id = 43;
 | 
|    SpdyHeaderBlock block;
 | 
|    testing::MockFunction<void(int)> checkpoint;  // NOLINT
 | 
|  
 | 
| -  scoped_ptr<SpdySerializedFrame> frame(
 | 
| +  std::unique_ptr<SpdySerializedFrame> frame(
 | 
|        spdy_framer_->CreatePingFrame(12, false));
 | 
|    block[":method"] = "GET";
 | 
|    block[":host"] = "www.example.com";
 | 
| 
 |