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

Unified Diff: mojo/system/channel_unittest.cc

Issue 611733002: Mojo: Convert OVERRIDE -> override in mojo/{embedder,system}. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 | « mojo/system/channel.h ('k') | mojo/system/core_test_base.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/system/channel_unittest.cc
diff --git a/mojo/system/channel_unittest.cc b/mojo/system/channel_unittest.cc
index 17e9548513fb4bf6db1f99f19bfcc51f858fc542..a99663e1b5f3bd193077355806851b0f04cde7d6 100644
--- a/mojo/system/channel_unittest.cc
+++ b/mojo/system/channel_unittest.cc
@@ -35,7 +35,7 @@ class ChannelTest : public testing::Test {
init_result_(TRISTATE_UNKNOWN) {}
virtual ~ChannelTest() {}
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
io_thread_.PostTaskAndWait(
FROM_HERE,
base::Bind(&ChannelTest::SetUpOnIOThread, base::Unretained(this)));
@@ -121,39 +121,39 @@ class MockRawChannelOnInitFails : public RawChannel {
virtual ~MockRawChannelOnInitFails() {}
// |RawChannel| public methods:
- virtual size_t GetSerializedPlatformHandleSize() const OVERRIDE { return 0; }
+ virtual size_t GetSerializedPlatformHandleSize() const override { return 0; }
private:
// |RawChannel| protected methods:
- virtual IOResult Read(size_t*) OVERRIDE {
+ virtual IOResult Read(size_t*) override {
CHECK(false);
return IO_FAILED_UNKNOWN;
}
- virtual IOResult ScheduleRead() OVERRIDE {
+ virtual IOResult ScheduleRead() override {
CHECK(false);
return IO_FAILED_UNKNOWN;
}
virtual embedder::ScopedPlatformHandleVectorPtr GetReadPlatformHandles(
size_t,
- const void*) OVERRIDE {
+ const void*) override {
CHECK(false);
return embedder::ScopedPlatformHandleVectorPtr();
}
- virtual IOResult WriteNoLock(size_t*, size_t*) OVERRIDE {
+ virtual IOResult WriteNoLock(size_t*, size_t*) override {
CHECK(false);
return IO_FAILED_UNKNOWN;
}
- virtual IOResult ScheduleWriteNoLock() OVERRIDE {
+ virtual IOResult ScheduleWriteNoLock() override {
CHECK(false);
return IO_FAILED_UNKNOWN;
}
- virtual bool OnInit() OVERRIDE {
+ virtual bool OnInit() override {
EXPECT_FALSE(on_init_called_);
on_init_called_ = true;
return false;
}
virtual void OnShutdownNoLock(scoped_ptr<ReadBuffer>,
- scoped_ptr<WriteBuffer>) OVERRIDE {
+ scoped_ptr<WriteBuffer>) override {
CHECK(false);
}
« no previous file with comments | « mojo/system/channel.h ('k') | mojo/system/core_test_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698