Some scoped_ptr -> std::unique_ptr conversion, especially under //mojo.

mojo/message_pump/message_pump_mojo.cc

 // Copyright 2013 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/message_pump/message_pump_mojo.h"
 
 #include <algorithm>
+#include <memory>
 #include <vector>
 
 #include "base/debug/alias.h"
 #include "base/logging.h"
 #include "base/threading/thread_local.h"
 #include "base/time/time.h"
 #include "mojo/message_pump/message_pump_mojo_handler.h"
 #include "mojo/message_pump/time_helper.h"
 #include "mojo/public/cpp/system/message_pipe.h"
 #include "mojo/public/cpp/system/wait.h"
@@ skipping 32 matching lines @@
     CreateMessagePipe(nullptr, &read_handle, &write_handle);
   }
 
   base::TimeTicks delayed_work_time;
 
   // Used to wake up WaitForWork().
   ScopedMessagePipeHandle read_handle;
   ScopedMessagePipeHandle write_handle;
 
   // Cached structures to avoid the heap allocation cost of std::vector<>.
-  scoped_ptr<WaitState> wait_state;
-  scoped_ptr<HandleToHandlerList> cloned_handlers;
+  std::unique_ptr<WaitState> wait_state;
+  std::unique_ptr<HandleToHandlerList> cloned_handlers;
 
   bool should_quit;
 };
 
 MessagePumpMojo::MessagePumpMojo() : run_state_(nullptr), next_handler_id_(0) {
   DCHECK(!current())
       << "There is already a MessagePumpMojo instance on this thread.";
   CurrentPump()->Set(this);
 }
 
@@ skipping 257 matching lines @@
 void MessagePumpMojo::WillSignalHandler() {
   FOR_EACH_OBSERVER(Observer, observers_, WillSignalHandler());
 }
 
 void MessagePumpMojo::DidSignalHandler() {
   FOR_EACH_OBSERVER(Observer, observers_, DidSignalHandler());
 }
 
 }  // namespace common
 }  // namespace mojo