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

Side by Side Diff: jingle/notifier/listener/non_blocking_push_client_unittest.cc

Issue 628123002: Replacing the OVERRIDE with override and FINAL with final in jingle (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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "jingle/notifier/listener/non_blocking_push_client.h" 5 #include "jingle/notifier/listener/non_blocking_push_client.h"
6 6
7 #include <cstddef> 7 #include <cstddef>
8 8
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
11 #include "base/message_loop/message_loop.h" 11 #include "base/message_loop/message_loop.h"
12 #include "jingle/notifier/base/fake_base_task.h" 12 #include "jingle/notifier/base/fake_base_task.h"
13 #include "jingle/notifier/listener/fake_push_client.h" 13 #include "jingle/notifier/listener/fake_push_client.h"
14 #include "jingle/notifier/listener/fake_push_client_observer.h" 14 #include "jingle/notifier/listener/fake_push_client_observer.h"
15 #include "jingle/notifier/listener/push_client_observer.h" 15 #include "jingle/notifier/listener/push_client_observer.h"
16 #include "net/url_request/url_request_test_util.h" 16 #include "net/url_request/url_request_test_util.h"
17 #include "testing/gtest/include/gtest/gtest.h" 17 #include "testing/gtest/include/gtest/gtest.h"
18 18
19 namespace notifier { 19 namespace notifier {
20 20
21 namespace { 21 namespace {
22 22
23 class NonBlockingPushClientTest : public testing::Test { 23 class NonBlockingPushClientTest : public testing::Test {
24 protected: 24 protected:
25 NonBlockingPushClientTest() : fake_push_client_(NULL) {} 25 NonBlockingPushClientTest() : fake_push_client_(NULL) {}
26 26
27 virtual ~NonBlockingPushClientTest() {} 27 virtual ~NonBlockingPushClientTest() {}
28 28
29 virtual void SetUp() OVERRIDE { 29 virtual void SetUp() override {
30 push_client_.reset( 30 push_client_.reset(
31 new NonBlockingPushClient( 31 new NonBlockingPushClient(
32 base::MessageLoopProxy::current(), 32 base::MessageLoopProxy::current(),
33 base::Bind(&NonBlockingPushClientTest::CreateFakePushClient, 33 base::Bind(&NonBlockingPushClientTest::CreateFakePushClient,
34 base::Unretained(this)))); 34 base::Unretained(this))));
35 push_client_->AddObserver(&fake_observer_); 35 push_client_->AddObserver(&fake_observer_);
36 // Pump message loop to run CreateFakePushClient. 36 // Pump message loop to run CreateFakePushClient.
37 message_loop_.RunUntilIdle(); 37 message_loop_.RunUntilIdle();
38 } 38 }
39 39
40 virtual void TearDown() OVERRIDE { 40 virtual void TearDown() override {
41 // Clear out any pending notifications before removing observers. 41 // Clear out any pending notifications before removing observers.
42 message_loop_.RunUntilIdle(); 42 message_loop_.RunUntilIdle();
43 push_client_->RemoveObserver(&fake_observer_); 43 push_client_->RemoveObserver(&fake_observer_);
44 push_client_.reset(); 44 push_client_.reset();
45 // Then pump message loop to run 45 // Then pump message loop to run
46 // NonBlockingPushClient::DestroyOnDelegateThread(). 46 // NonBlockingPushClient::DestroyOnDelegateThread().
47 message_loop_.RunUntilIdle(); 47 message_loop_.RunUntilIdle();
48 } 48 }
49 49
50 scoped_ptr<PushClient> CreateFakePushClient() { 50 scoped_ptr<PushClient> CreateFakePushClient() {
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 142
143 fake_push_client_->SimulateIncomingNotification(notification); 143 fake_push_client_->SimulateIncomingNotification(notification);
144 message_loop_.RunUntilIdle(); 144 message_loop_.RunUntilIdle();
145 EXPECT_TRUE( 145 EXPECT_TRUE(
146 fake_observer_.last_incoming_notification().Equals(notification)); 146 fake_observer_.last_incoming_notification().Equals(notification));
147 } 147 }
148 148
149 } // namespace 149 } // namespace
150 150
151 } // namespace notifier 151 } // namespace notifier
OLDNEW
« no previous file with comments | « jingle/notifier/listener/non_blocking_push_client.cc ('k') | jingle/notifier/listener/push_notifications_listen_task.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698