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

Unified Diff: ui/base/ime/chromeos/component_extension_ime_manager_unittest.cc

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr 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
« no previous file with comments | « ui/base/ime/chromeos/component_extension_ime_manager.cc ('k') | ui/base/ime/chromeos/ime_keyboard_x11.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/ime/chromeos/component_extension_ime_manager_unittest.cc
diff --git a/ui/base/ime/chromeos/component_extension_ime_manager_unittest.cc b/ui/base/ime/chromeos/component_extension_ime_manager_unittest.cc
index b368b01e2d759fb6284a2f0be4a34f89bcfb598d..7d9260ca96b673635761eb75ca243166eea5f545 100644
--- a/ui/base/ime/chromeos/component_extension_ime_manager_unittest.cc
+++ b/ui/base/ime/chromeos/component_extension_ime_manager_unittest.cc
@@ -2,12 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "ui/base/ime/chromeos/component_extension_ime_manager.h"
+
#include <stddef.h>
#include "base/logging.h"
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "ui/base/ime/chromeos/component_extension_ime_manager.h"
#include "ui/base/ime/chromeos/extension_ime_util.h"
#include "ui/base/ime/chromeos/mock_component_extension_ime_manager_delegate.h"
@@ -114,7 +116,7 @@ class ComponentExtensionIMEManagerTest : public testing::Test {
mock_delegate_ = new MockComponentExtIMEManagerDelegate();
mock_delegate_->set_ime_list(ime_list_);
component_ext_mgr_.reset(new ComponentExtensionIMEManager());
- component_ext_mgr_->Initialize(make_scoped_ptr(mock_delegate_));
+ component_ext_mgr_->Initialize(base::WrapUnique(mock_delegate_));
}
virtual void TearDown() {
@@ -122,7 +124,7 @@ class ComponentExtensionIMEManagerTest : public testing::Test {
protected:
MockComponentExtIMEManagerDelegate* mock_delegate_;
- scoped_ptr<ComponentExtensionIMEManager> component_ext_mgr_;
+ std::unique_ptr<ComponentExtensionIMEManager> component_ext_mgr_;
std::vector<ComponentExtensionIME> ime_list_;
private:
« no previous file with comments | « ui/base/ime/chromeos/component_extension_ime_manager.cc ('k') | ui/base/ime/chromeos/ime_keyboard_x11.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698