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

Side by Side Diff: ui/display/chromeos/apply_content_protection_task_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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/display/chromeos/apply_content_protection_task.h" 5 #include "ui/display/chromeos/apply_content_protection_task.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/macros.h" 11 #include "base/macros.h"
12 #include "testing/gtest/include/gtest/gtest.h" 12 #include "testing/gtest/include/gtest/gtest.h"
13 #include "ui/display/chromeos/display_layout_manager.h" 13 #include "ui/display/chromeos/display_layout_manager.h"
14 #include "ui/display/chromeos/test/action_logger_util.h" 14 #include "ui/display/chromeos/test/action_logger_util.h"
15 #include "ui/display/chromeos/test/test_display_layout_manager.h" 15 #include "ui/display/chromeos/test/test_display_layout_manager.h"
16 #include "ui/display/chromeos/test/test_display_snapshot.h" 16 #include "ui/display/chromeos/test/test_display_snapshot.h"
17 #include "ui/display/chromeos/test/test_native_display_delegate.h" 17 #include "ui/display/chromeos/test/test_native_display_delegate.h"
18 18
19 namespace ui { 19 namespace ui {
20 namespace test { 20 namespace test {
21 21
22 namespace { 22 namespace {
23 23
24 scoped_ptr<DisplaySnapshot> CreateDisplaySnapshot(int64_t id, 24 std::unique_ptr<DisplaySnapshot> CreateDisplaySnapshot(
25 DisplayConnectionType type) { 25 int64_t id,
26 scoped_ptr<TestDisplaySnapshot> display(new TestDisplaySnapshot()); 26 DisplayConnectionType type) {
27 std::unique_ptr<TestDisplaySnapshot> display(new TestDisplaySnapshot());
27 display->set_display_id(id); 28 display->set_display_id(id);
28 display->set_type(type); 29 display->set_type(type);
29 30
30 return std::move(display); 31 return std::move(display);
31 } 32 }
32 33
33 } // namespace 34 } // namespace
34 35
35 class ApplyContentProtectionTaskTest : public testing::Test { 36 class ApplyContentProtectionTaskTest : public testing::Test {
36 public: 37 public:
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 base::Bind(&ApplyContentProtectionTaskTest::ResponseCallback, 171 base::Bind(&ApplyContentProtectionTaskTest::ResponseCallback,
171 base::Unretained(this))); 172 base::Unretained(this)));
172 task.Run(); 173 task.Run();
173 174
174 EXPECT_EQ(SUCCESS, response_); 175 EXPECT_EQ(SUCCESS, response_);
175 EXPECT_EQ(kNoActions, log_.GetActionsAndClear()); 176 EXPECT_EQ(kNoActions, log_.GetActionsAndClear());
176 } 177 }
177 178
178 } // namespace test 179 } // namespace test
179 } // namespace ui 180 } // namespace ui
OLDNEW
« no previous file with comments | « ui/compositor/transform_animation_curve_adapter.cc ('k') | ui/display/chromeos/display_configurator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698