EDK: Some more scoped_ptr -> std::unique_ptr conversions.

mojo/edk/system/master_connection_manager.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "mojo/edk/system/master_connection_manager.h"
 
 #include <memory>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 73 matching lines @@
   void OnError(Error error) override;
 
   // Handles an error that's fatal to this object. Note that this probably
   // results in |Shutdown()| being called (in the nested context) and then this
   // object being destroyed.
   void FatalError();
 
   MasterConnectionManager* const owner_;
   const ProcessIdentifier process_identifier_;
   embedder::SlaveInfo const slave_info_;
-  scoped_ptr<RawChannel> raw_channel_;
+  std::unique_ptr<RawChannel> raw_channel_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(Helper);
 };
 
 MasterConnectionManager::Helper::Helper(
     MasterConnectionManager* owner,
     ProcessIdentifier process_identifier,
     embedder::SlaveInfo slave_info,
     embedder::ScopedPlatformHandle platform_handle)
     : owner_(owner),
@@ skipping 631 matching lines @@
 }
 
 void MasterConnectionManager::AssertOnPrivateThread() const {
   // This should only be called after |Init()| and before |Shutdown()|.
   DCHECK(private_thread_.message_loop());
   DCHECK_EQ(base::MessageLoop::current(), private_thread_.message_loop());
 }
 
 }  // namespace system
 }  // namespace mojo