Replace scoped_ptr with std::unique_ptr in //ui

ui/base/ime/input_method_factory.cc

 // Copyright (c) 2012 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 "ui/base/ime/input_method_factory.h"
 
+#include "base/memory/ptr_util.h"
 #include "build/build_config.h"
 #include "ui/base/ime/mock_input_method.h"
 
 #if defined(OS_CHROMEOS)
 #include "ui/base/ime/input_method_chromeos.h"
 #elif defined(OS_WIN)
 #include "ui/base/ime/input_method_win.h"
 #elif defined(OS_MACOSX)
 #include "ui/base/ime/input_method_mac.h"
 #elif defined(USE_AURA) && defined(OS_LINUX) && defined(USE_X11) && \
@@ skipping 10 matching lines @@
 ui::InputMethod* g_input_method_for_testing = nullptr;
 
 bool g_input_method_set_for_testing = false;
 
 bool g_create_input_method_called = false;
 
 }  // namespace
 
 namespace ui {
 
-scoped_ptr<InputMethod> CreateInputMethod(
+std::unique_ptr<InputMethod> CreateInputMethod(
     internal::InputMethodDelegate* delegate,
     gfx::AcceleratedWidget widget) {
   if (!g_create_input_method_called)
     g_create_input_method_called = true;
 
   if (g_input_method_for_testing) {
     ui::InputMethod* ret = g_input_method_for_testing;
     g_input_method_for_testing = nullptr;
-    return make_scoped_ptr(ret);
+    return base::WrapUnique(ret);
   }
 
   if (g_input_method_set_for_testing)
-    return make_scoped_ptr(new MockInputMethod(delegate));
+    return base::WrapUnique(new MockInputMethod(delegate));
 
 #if defined(OS_CHROMEOS)
-  return make_scoped_ptr(new InputMethodChromeOS(delegate));
+  return base::WrapUnique(new InputMethodChromeOS(delegate));
 #elif defined(OS_WIN)
-  return make_scoped_ptr(new InputMethodWin(delegate, widget));
+  return base::WrapUnique(new InputMethodWin(delegate, widget));
 #elif defined(OS_MACOSX)
-  return make_scoped_ptr(new InputMethodMac(delegate));
+  return base::WrapUnique(new InputMethodMac(delegate));
 #elif defined(USE_AURA) && defined(OS_LINUX) && defined(USE_X11) && \
       !defined(OS_CHROMEOS)
-  return make_scoped_ptr(new InputMethodAuraLinux(delegate));
+  return base::WrapUnique(new InputMethodAuraLinux(delegate));
 #elif defined(OS_ANDROID)
-  return make_scoped_ptr(new InputMethodAndroid(delegate));
+  return base::WrapUnique(new InputMethodAndroid(delegate));
 #else
-  return make_scoped_ptr(new InputMethodMinimal(delegate));
+  return base::WrapUnique(new InputMethodMinimal(delegate));
 #endif
 }
 
 void SetUpInputMethodFactoryForTesting() {
   if (g_input_method_set_for_testing)
     return;
 
   CHECK(!g_create_input_method_called)
       << "ui::SetUpInputMethodFactoryForTesting was called after use of "
       << "ui::CreateInputMethod.  You must call "
       << "ui::SetUpInputMethodFactoryForTesting earlier.";
 
   g_input_method_set_for_testing = true;
 }
 
 void SetUpInputMethodForTesting(InputMethod* input_method) {
   g_input_method_for_testing = input_method;
 }
 
 }  // namespace ui