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

Unified Diff: components/arc/ime/arc_ime_service_unittest.cc

Issue 1921973002: Convert //components/[a-e]* from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . 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 | « components/arc/ime/arc_ime_service.cc ('k') | components/arc/net/arc_net_host_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/arc/ime/arc_ime_service_unittest.cc
diff --git a/components/arc/ime/arc_ime_service_unittest.cc b/components/arc/ime/arc_ime_service_unittest.cc
index 7b90e1570a021443d5fc94aa28385226d9acd6d6..a35ffc559ec8e84ef6c9e200e69a694cf8767799 100644
--- a/components/arc/ime/arc_ime_service_unittest.cc
+++ b/components/arc/ime/arc_ime_service_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 "components/arc/ime/arc_ime_service.h"
+
+#include <memory>
#include <utility>
-#include "base/memory/scoped_ptr.h"
+#include "base/memory/ptr_util.h"
#include "base/strings/string16.h"
#include "base/strings/utf_string_conversions.h"
-#include "components/arc/ime/arc_ime_service.h"
#include "components/arc/test/fake_arc_bridge_service.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/base/ime/composition_text.h"
@@ -71,15 +73,15 @@ class ArcImeServiceTest : public testing::Test {
ArcImeServiceTest() {}
protected:
- scoped_ptr<FakeArcBridgeService> fake_arc_bridge_service_;
- scoped_ptr<FakeInputMethod> fake_input_method_;
- scoped_ptr<ArcImeService> instance_;
+ std::unique_ptr<FakeArcBridgeService> fake_arc_bridge_service_;
+ std::unique_ptr<FakeInputMethod> fake_input_method_;
+ std::unique_ptr<ArcImeService> instance_;
private:
void SetUp() override {
fake_arc_bridge_service_.reset(new FakeArcBridgeService);
instance_.reset(new ArcImeService(fake_arc_bridge_service_.get()));
- instance_->SetImeBridgeForTesting(make_scoped_ptr(new FakeArcImeBridge));
+ instance_->SetImeBridgeForTesting(base::WrapUnique(new FakeArcImeBridge));
fake_input_method_.reset(new FakeInputMethod);
instance_->SetInputMethodForTesting(fake_input_method_.get());
« no previous file with comments | « components/arc/ime/arc_ime_service.cc ('k') | components/arc/net/arc_net_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698