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

Side by Side Diff: content/renderer/gpu/frame_swap_message_queue_unittest.cc

Issue 2253053003: Re-write many calls to WrapUnique() with MakeUnique() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "content/renderer/gpu/frame_swap_message_queue.h" 5 #include "content/renderer/gpu/frame_swap_message_queue.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/memory/ptr_util.h" 9 #include "base/memory/ptr_util.h"
10 #include "ipc/ipc_message.h" 10 #include "ipc/ipc_message.h"
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 const std::vector<std::unique_ptr<IPC::Message>>& messages, 58 const std::vector<std::unique_ptr<IPC::Message>>& messages,
59 int routing_id) { 59 int routing_id) {
60 for (const auto& msg : messages) { 60 for (const auto& msg : messages) {
61 if (msg->routing_id() == routing_id) 61 if (msg->routing_id() == routing_id)
62 return true; 62 return true;
63 } 63 }
64 return false; 64 return false;
65 } 65 }
66 66
67 std::unique_ptr<IPC::Message> CloneMessage(const IPC::Message& other) { 67 std::unique_ptr<IPC::Message> CloneMessage(const IPC::Message& other) {
68 return base::WrapUnique(new IPC::Message(other)); 68 return base::MakeUnique<IPC::Message>(other);
69 } 69 }
70 70
71 void TestDidNotSwap(cc::SwapPromise::DidNotSwapReason reason); 71 void TestDidNotSwap(cc::SwapPromise::DidNotSwapReason reason);
72 72
73 IPC::Message first_message_; 73 IPC::Message first_message_;
74 IPC::Message second_message_; 74 IPC::Message second_message_;
75 IPC::Message third_message_; 75 IPC::Message third_message_;
76 scoped_refptr<FrameSwapMessageQueue> queue_; 76 scoped_refptr<FrameSwapMessageQueue> queue_;
77 }; 77 };
78 78
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
257 NotifiesDeletionMessage(bool* deleted, const IPC::Message& other) 257 NotifiesDeletionMessage(bool* deleted, const IPC::Message& other)
258 : IPC::Message(other), deleted_(deleted) {} 258 : IPC::Message(other), deleted_(deleted) {}
259 ~NotifiesDeletionMessage() override { *deleted_ = true; } 259 ~NotifiesDeletionMessage() override { *deleted_ = true; }
260 260
261 private: 261 private:
262 bool* deleted_; 262 bool* deleted_;
263 }; 263 };
264 264
265 TEST_F(FrameSwapMessageQueueTest, TestDeletesNextSwapMessage) { 265 TEST_F(FrameSwapMessageQueueTest, TestDeletesNextSwapMessage) {
266 bool message_deleted = false; 266 bool message_deleted = false;
267 QueueNextSwapMessage(base::WrapUnique( 267 QueueNextSwapMessage(base::MakeUnique<NotifiesDeletionMessage>(
268 new NotifiesDeletionMessage(&message_deleted, first_message_))); 268 &message_deleted, first_message_));
269 queue_ = NULL; 269 queue_ = NULL;
270 ASSERT_TRUE(message_deleted); 270 ASSERT_TRUE(message_deleted);
271 } 271 }
272 272
273 TEST_F(FrameSwapMessageQueueTest, TestDeletesVisualStateMessage) { 273 TEST_F(FrameSwapMessageQueueTest, TestDeletesVisualStateMessage) {
274 bool message_deleted = false; 274 bool message_deleted = false;
275 QueueVisualStateMessage(1, base::WrapUnique(new NotifiesDeletionMessage( 275 QueueVisualStateMessage(1, base::MakeUnique<NotifiesDeletionMessage>(
276 &message_deleted, first_message_))); 276 &message_deleted, first_message_));
277 queue_ = NULL; 277 queue_ = NULL;
278 ASSERT_TRUE(message_deleted); 278 ASSERT_TRUE(message_deleted);
279 } 279 }
280 280
281 TEST_F(FrameSwapMessageQueueTest, TestDeletesQueuedVisualStateMessage) { 281 TEST_F(FrameSwapMessageQueueTest, TestDeletesQueuedVisualStateMessage) {
282 bool message_deleted = false; 282 bool message_deleted = false;
283 QueueVisualStateMessage(1, base::WrapUnique(new NotifiesDeletionMessage( 283 QueueVisualStateMessage(1, base::MakeUnique<NotifiesDeletionMessage>(
284 &message_deleted, first_message_))); 284 &message_deleted, first_message_));
285 queue_->DidActivate(1); 285 queue_->DidActivate(1);
286 queue_->DidSwap(1); 286 queue_->DidSwap(1);
287 queue_ = NULL; 287 queue_ = NULL;
288 ASSERT_TRUE(message_deleted); 288 ASSERT_TRUE(message_deleted);
289 } 289 }
290 290
291 } // namespace content 291 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/gpu/frame_swap_message_queue.cc ('k') | content/renderer/history_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698