Index: ui/base/ime/chromeos/input_method_whitelist.cc |
diff --git a/ui/base/ime/chromeos/input_method_whitelist.cc b/ui/base/ime/chromeos/input_method_whitelist.cc |
index ab641a5a49687a2cd6b4a6845657d4e834957fb1..3995ba19f3e11cb4dc877504ac89a9c861a733dc 100644 |
--- a/ui/base/ime/chromeos/input_method_whitelist.cc |
+++ b/ui/base/ime/chromeos/input_method_whitelist.cc |
@@ -34,9 +34,10 @@ bool InputMethodWhitelist::InputMethodIdIsWhitelisted( |
return supported_input_methods_.count(input_method_id) > 0; |
} |
-scoped_ptr<InputMethodDescriptors> |
+std::unique_ptr<InputMethodDescriptors> |
InputMethodWhitelist::GetSupportedInputMethods() const { |
- scoped_ptr<InputMethodDescriptors> input_methods(new InputMethodDescriptors); |
+ std::unique_ptr<InputMethodDescriptors> input_methods( |
+ new InputMethodDescriptors); |
input_methods->reserve(arraysize(kInputMethods)); |
for (size_t i = 0; i < arraysize(kInputMethods); ++i) { |
std::vector<std::string> layouts; |