Index: chrome/browser/ui/input_method/input_method_engine_base.cc |
diff --git a/chrome/browser/ui/input_method/input_method_engine_base.cc b/chrome/browser/ui/input_method/input_method_engine_base.cc |
index 5f5a2eb701d83286545ba53bc78105baf5ef3ee7..7d9d3c8d1174063cef940a07167e6e0d92a834f1 100644 |
--- a/chrome/browser/ui/input_method/input_method_engine_base.cc |
+++ b/chrome/browser/ui/input_method/input_method_engine_base.cc |
@@ -4,6 +4,8 @@ |
#include "chrome/browser/ui/input_method/input_method_engine_base.h" |
+#include <memory> |
+ |
#undef FocusIn |
#undef FocusOut |
#undef RootWindow |
@@ -11,7 +13,6 @@ |
#include <map> |
#include "base/logging.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/metrics/histogram.h" |
#include "base/strings/string_number_conversions.h" |
#include "base/strings/string_util.h" |
@@ -168,7 +169,7 @@ InputMethodEngineBase::InputMethodEngineBase() |
InputMethodEngineBase::~InputMethodEngineBase() {} |
void InputMethodEngineBase::Initialize( |
- scoped_ptr<InputMethodEngineBase::Observer> observer, |
+ std::unique_ptr<InputMethodEngineBase::Observer> observer, |
const char* extension_id, |
Profile* profile) { |
DCHECK(observer) << "Observer must not be null."; |