Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3533)

Unified Diff: chrome/browser/chromeos/input_method/input_method_engine_unittest.cc

Issue 1870793002: Convert //chrome/browser/chromeos from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/input_method/input_method_engine_unittest.cc
diff --git a/chrome/browser/chromeos/input_method/input_method_engine_unittest.cc b/chrome/browser/chromeos/input_method/input_method_engine_unittest.cc
index c503a3f4cd9e62da3b807cf9e68b6900a4531328..fc20b9c48729cc81d3ea586eeff91dcedba7f3d6 100644
--- a/chrome/browser/chromeos/input_method/input_method_engine_unittest.cc
+++ b/chrome/browser/chromeos/input_method/input_method_engine_unittest.cc
@@ -64,11 +64,11 @@ void InitInputMethod() {
ime_list.push_back(ext1);
delegate->set_ime_list(ime_list);
comp_ime_manager->Initialize(
- scoped_ptr<ComponentExtensionIMEManagerDelegate>(delegate));
+ std::unique_ptr<ComponentExtensionIMEManagerDelegate>(delegate));
MockInputMethodManager* manager = new MockInputMethodManager;
manager->SetComponentExtensionIMEManager(
- scoped_ptr<ComponentExtensionIMEManager>(comp_ime_manager));
+ std::unique_ptr<ComponentExtensionIMEManager>(comp_ime_manager));
InitializeForTesting(manager);
}
@@ -145,7 +145,7 @@ class InputMethodEngineTest : public testing::Test {
void CreateEngine(bool whitelisted) {
engine_.reset(new InputMethodEngine());
observer_ = new TestObserver();
- scoped_ptr<InputMethodEngineBase::Observer> observer_ptr(observer_);
+ std::unique_ptr<InputMethodEngineBase::Observer> observer_ptr(observer_);
engine_->Initialize(std::move(observer_ptr),
whitelisted ? kTestExtensionId : kTestExtensionId2,
ProfileManager::GetActiveUserProfile());
@@ -158,7 +158,7 @@ class InputMethodEngineTest : public testing::Test {
ui::IMEBridge::Get()->SetCurrentInputContext(input_context);
}
- scoped_ptr<InputMethodEngine> engine_;
+ std::unique_ptr<InputMethodEngine> engine_;
TestObserver* observer_;
std::vector<std::string> languages_;
@@ -166,7 +166,7 @@ class InputMethodEngineTest : public testing::Test {
GURL options_page_;
GURL input_view_;
- scoped_ptr<MockIMEInputContextHandler> mock_ime_input_context_handler_;
+ std::unique_ptr<MockIMEInputContextHandler> mock_ime_input_context_handler_;
private:
DISALLOW_COPY_AND_ASSIGN(InputMethodEngineTest);

Powered by Google App Engine
This is Rietveld 408576698