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

mojo/message_pump/handle_watcher.h

 // 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.
 
 #ifndef MOJO_MESSAGE_PUMP_HANDLE_WATCHER_H_
 #define MOJO_MESSAGE_PUMP_HANDLE_WATCHER_H_
 
+#include <memory>
+
 #include "base/callback_forward.h"
 #include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "mojo/public/c/system/time.h"
 #include "mojo/public/cpp/system/handle.h"
 
 namespace base {
 class Thread;
 }
 
 namespace mojo {
 namespace common {
@@ skipping 24 matching lines @@
 
   // Stops listening. Does nothing if not in the process of listening. Blocks
   // until no longer listening on the handle.
   void Stop();
 
  private:
   class StateBase;
   class SameThreadWatchingState;
   class SecondaryThreadWatchingState;
 
-  // If non-NULL Start() has been invoked.
-  scoped_ptr<StateBase> state_;
+  // If non-null, Start() has been invoked.
+  std::unique_ptr<StateBase> state_;
 
   DISALLOW_COPY_AND_ASSIGN(HandleWatcher);
 };
 
 }  // namespace common
 }  // namespace mojo
 
 #endif  // MOJO_MESSAGE_PUMP_HANDLE_WATCHER_H_