| Index: net/test/embedded_test_server/embedded_test_server_unittest.cc
|
| diff --git a/net/test/embedded_test_server/embedded_test_server_unittest.cc b/net/test/embedded_test_server/embedded_test_server_unittest.cc
|
| index 9823947fb5dfdff312ce49cf46ba41ccdb3212af..9da982c580c4b5d28fcb66c1d13359d2cb1c6ed4 100644
|
| --- a/net/test/embedded_test_server/embedded_test_server_unittest.cc
|
| +++ b/net/test/embedded_test_server/embedded_test_server_unittest.cc
|
| @@ -49,7 +49,7 @@ class EmbeddedTestServerTest: public testing::Test,
|
| io_thread_("io_thread") {
|
| }
|
|
|
| - virtual void SetUp() OVERRIDE {
|
| + virtual void SetUp() override {
|
| base::Thread::Options thread_options;
|
| thread_options.message_loop_type = base::MessageLoop::TYPE_IO;
|
| ASSERT_TRUE(io_thread_.StartWithOptions(thread_options));
|
| @@ -61,12 +61,12 @@ class EmbeddedTestServerTest: public testing::Test,
|
| ASSERT_TRUE(server_->InitializeAndWaitUntilReady());
|
| }
|
|
|
| - virtual void TearDown() OVERRIDE {
|
| + virtual void TearDown() override {
|
| ASSERT_TRUE(server_->ShutdownAndWaitUntilComplete());
|
| }
|
|
|
| // URLFetcherDelegate override.
|
| - virtual void OnURLFetchComplete(const URLFetcher* source) OVERRIDE {
|
| + virtual void OnURLFetchComplete(const URLFetcher* source) override {
|
| ++num_responses_received_;
|
| if (num_responses_received_ == num_responses_expected_)
|
| base::MessageLoop::current()->Quit();
|
| @@ -260,7 +260,7 @@ class EmbeddedTestServerThreadingTestDelegate
|
| message_loop_present_on_shutdown_(message_loop_present_on_shutdown) {}
|
|
|
| // base::PlatformThread::Delegate:
|
| - virtual void ThreadMain() OVERRIDE {
|
| + virtual void ThreadMain() override {
|
| scoped_refptr<base::SingleThreadTaskRunner> io_thread_runner;
|
| base::Thread io_thread("io_thread");
|
| base::Thread::Options thread_options;
|
| @@ -298,7 +298,7 @@ class EmbeddedTestServerThreadingTestDelegate
|
| }
|
|
|
| // URLFetcherDelegate override.
|
| - virtual void OnURLFetchComplete(const URLFetcher* source) OVERRIDE {
|
| + virtual void OnURLFetchComplete(const URLFetcher* source) override {
|
| base::MessageLoop::current()->Quit();
|
| }
|
|
|
|
|