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

Side by Side Diff: content/renderer/input/input_event_filter_unittest.cc

Issue 633303002: Replace FINAL and OVERRIDE with their C++11 counterparts in content/renderer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 <new> 5 #include <new>
6 #include <utility> 6 #include <utility>
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 }; 73 };
74 74
75 InputEventFilter* filter_; 75 InputEventFilter* filter_;
76 bool handle_events_; 76 bool handle_events_;
77 bool send_to_widget_; 77 bool send_to_widget_;
78 std::vector<Record> records_; 78 std::vector<Record> records_;
79 }; 79 };
80 80
81 class IPCMessageRecorder : public IPC::Listener { 81 class IPCMessageRecorder : public IPC::Listener {
82 public: 82 public:
83 virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE { 83 virtual bool OnMessageReceived(const IPC::Message& message) override {
84 messages_.push_back(message); 84 messages_.push_back(message);
85 return true; 85 return true;
86 } 86 }
87 87
88 size_t message_count() const { return messages_.size(); } 88 size_t message_count() const { return messages_.size(); }
89 89
90 const IPC::Message& message_at(size_t i) const { 90 const IPC::Message& message_at(size_t i) const {
91 return messages_[i]; 91 return messages_[i];
92 } 92 }
93 93
(...skipping 24 matching lines...) Expand all
118 kTestRoutingID, &events[i], ui::LatencyInfo(), false)); 118 kTestRoutingID, &events[i], ui::LatencyInfo(), false));
119 } 119 }
120 120
121 AddMessagesToFilter(message_filter, messages); 121 AddMessagesToFilter(message_filter, messages);
122 } 122 }
123 123
124 } // namespace 124 } // namespace
125 125
126 class InputEventFilterTest : public testing::Test { 126 class InputEventFilterTest : public testing::Test {
127 public: 127 public:
128 virtual void SetUp() OVERRIDE { 128 virtual void SetUp() override {
129 filter_ = new InputEventFilter(&message_recorder_, 129 filter_ = new InputEventFilter(&message_recorder_,
130 base::MessageLoopProxy::current(), 130 base::MessageLoopProxy::current(),
131 message_loop_.message_loop_proxy()); 131 message_loop_.message_loop_proxy());
132 filter_->SetBoundHandler( 132 filter_->SetBoundHandler(
133 base::Bind(&InputEventRecorder::HandleInputEvent, 133 base::Bind(&InputEventRecorder::HandleInputEvent,
134 base::Unretained(&event_recorder_))); 134 base::Unretained(&event_recorder_)));
135 135
136 event_recorder_.set_filter(filter_.get()); 136 event_recorder_.set_filter(filter_.get());
137 137
138 filter_->OnFilterAdded(&ipc_sink_); 138 filter_->OnFilterAdded(&ipc_sink_);
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
289 289
290 // We should have sent all messages back to the main thread and preserved 290 // We should have sent all messages back to the main thread and preserved
291 // their relative order. 291 // their relative order.
292 ASSERT_EQ(message_recorder_.message_count(), messages.size()); 292 ASSERT_EQ(message_recorder_.message_count(), messages.size());
293 for (size_t i = 0; i < messages.size(); ++i) { 293 for (size_t i = 0; i < messages.size(); ++i) {
294 EXPECT_EQ(message_recorder_.message_at(i).type(), messages[i].type()) << i; 294 EXPECT_EQ(message_recorder_.message_at(i).type(), messages[i].type()) << i;
295 } 295 }
296 } 296 }
297 297
298 } // namespace content 298 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/input/input_event_filter.h ('k') | content/renderer/input/input_handler_proxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698