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

Side by Side Diff: blimp/net/blimp_message_checkpointer_unittest.cc

Issue 2250433006: Re-write many calls to WrapUnique() with MakeUnique() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase 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
« no previous file with comments | « blimp/engine/session/blimp_engine_session.cc ('k') | blimp/net/blimp_message_multiplexer.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "blimp/net/blimp_message_checkpointer.h" 5 #include "blimp/net/blimp_message_checkpointer.h"
6 6
7 #include "base/memory/ptr_util.h" 7 #include "base/memory/ptr_util.h"
8 #include "base/memory/ref_counted.h" 8 #include "base/memory/ref_counted.h"
9 #include "base/test/test_mock_time_task_runner.h" 9 #include "base/test/test_mock_time_task_runner.h"
10 #include "base/threading/thread_task_runner_handle.h" 10 #include "base/threading/thread_task_runner_handle.h"
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 std::unique_ptr<BlimpMessage> message(CreateBlimpMessage(&input)); 44 std::unique_ptr<BlimpMessage> message(CreateBlimpMessage(&input));
45 message->set_message_id(++message_id_); 45 message->set_message_id(++message_id_);
46 checkpointer_->ProcessMessage( 46 checkpointer_->ProcessMessage(
47 std::move(message), 47 std::move(message),
48 base::Bind(&BlimpMessageCheckpointerTest::IncomingCompletionCallback, 48 base::Bind(&BlimpMessageCheckpointerTest::IncomingCompletionCallback,
49 base::Unretained(this))); 49 base::Unretained(this)));
50 return message_id_; 50 return message_id_;
51 } 51 }
52 52
53 void SetUp() override { 53 void SetUp() override {
54 checkpointer_ = base::WrapUnique(new BlimpMessageCheckpointer( 54 checkpointer_ = base::MakeUnique<BlimpMessageCheckpointer>(
55 &incoming_processor_, &outgoing_processor_, &checkpoint_observer_)); 55 &incoming_processor_, &outgoing_processor_, &checkpoint_observer_);
56 } 56 }
57 57
58 MOCK_METHOD1(IncomingCompletionCallback, void(int)); 58 MOCK_METHOD1(IncomingCompletionCallback, void(int));
59 59
60 protected: 60 protected:
61 // Used to verify timing-specific behaviours. 61 // Used to verify timing-specific behaviours.
62 scoped_refptr<base::TestMockTimeTaskRunner> runner_; 62 scoped_refptr<base::TestMockTimeTaskRunner> runner_;
63 base::ThreadTaskRunnerHandle runner_handle_; 63 base::ThreadTaskRunnerHandle runner_handle_;
64 64
65 int64_t message_id_ = 0; 65 int64_t message_id_ = 0;
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 162
163 // Simulate an incoming message. 163 // Simulate an incoming message.
164 std::unique_ptr<BlimpMessage> ack_message = CreateCheckpointAckMessage(10); 164 std::unique_ptr<BlimpMessage> ack_message = CreateCheckpointAckMessage(10);
165 checkpointer_->ProcessMessage( 165 checkpointer_->ProcessMessage(
166 std::move(ack_message), 166 std::move(ack_message),
167 base::Bind(&BlimpMessageCheckpointerTest::IncomingCompletionCallback, 167 base::Bind(&BlimpMessageCheckpointerTest::IncomingCompletionCallback,
168 base::Unretained(this))); 168 base::Unretained(this)));
169 } 169 }
170 170
171 } // namespace blimp 171 } // namespace blimp
OLDNEW
« no previous file with comments | « blimp/engine/session/blimp_engine_session.cc ('k') | blimp/net/blimp_message_multiplexer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698