| Index: chrome/browser/chromeos/input_method/mock_input_method_manager.cc
|
| diff --git a/chrome/browser/chromeos/input_method/mock_input_method_manager.cc b/chrome/browser/chromeos/input_method/mock_input_method_manager.cc
|
| index 5f14a89b905d1c77f0c93fc3f44b17c17c7a1e5a..2ee0915d99ba0b2b862d34cb961e9a6c8b1243fd 100644
|
| --- a/chrome/browser/chromeos/input_method/mock_input_method_manager.cc
|
| +++ b/chrome/browser/chromeos/input_method/mock_input_method_manager.cc
|
| @@ -56,17 +56,17 @@ void MockInputMethodManager::RemoveCandidateWindowObserver(
|
| void MockInputMethodManager::RemoveImeMenuObserver(
|
| InputMethodManager::ImeMenuObserver* observer) {}
|
|
|
| -scoped_ptr<InputMethodDescriptors>
|
| +std::unique_ptr<InputMethodDescriptors>
|
| MockInputMethodManager::GetSupportedInputMethods() const {
|
| - scoped_ptr<InputMethodDescriptors> result(new InputMethodDescriptors);
|
| + std::unique_ptr<InputMethodDescriptors> result(new InputMethodDescriptors);
|
| result->push_back(
|
| InputMethodUtil::GetFallbackInputMethodDescriptor());
|
| return result;
|
| }
|
|
|
| -scoped_ptr<InputMethodDescriptors>
|
| +std::unique_ptr<InputMethodDescriptors>
|
| MockInputMethodManager::State::GetActiveInputMethods() const {
|
| - scoped_ptr<InputMethodDescriptors> result(new InputMethodDescriptors);
|
| + std::unique_ptr<InputMethodDescriptors> result(new InputMethodDescriptors);
|
| result->push_back(
|
| InputMethodUtil::GetFallbackInputMethodDescriptor());
|
| return result;
|
| @@ -202,7 +202,7 @@ ComponentExtensionIMEManager*
|
| }
|
|
|
| void MockInputMethodManager::SetComponentExtensionIMEManager(
|
| - scoped_ptr<ComponentExtensionIMEManager> comp_ime_manager) {
|
| + std::unique_ptr<ComponentExtensionIMEManager> comp_ime_manager) {
|
| comp_ime_manager_ = std::move(comp_ime_manager);
|
| }
|
|
|
|
|