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

Side by Side Diff: jingle/notifier/base/weak_xmpp_client_unittest.cc

Issue 450463002: Update webrtc&libjingle 6774:6825. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 6 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 | Annotate | Revision Log
« no previous file with comments | « jingle/notifier/base/weak_xmpp_client.cc ('k') | jingle/notifier/base/xmpp_connection.h » ('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 (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/base/weak_xmpp_client.h" 5 #include "jingle/notifier/base/weak_xmpp_client.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/memory/weak_ptr.h" 9 #include "base/memory/weak_ptr.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
11 #include "jingle/glue/task_pump.h" 11 #include "jingle/glue/task_pump.h"
12 #include "talk/base/sigslot.h"
13 #include "testing/gmock/include/gmock/gmock.h" 12 #include "testing/gmock/include/gmock/gmock.h"
14 #include "testing/gtest/include/gtest/gtest.h" 13 #include "testing/gtest/include/gtest/gtest.h"
14 #include "webrtc/base/sigslot.h"
15 15
16 namespace notifier { 16 namespace notifier {
17 17
18 namespace { 18 namespace {
19 19
20 class MockXmppDelegate : public sigslot::has_slots<> { 20 class MockXmppDelegate : public sigslot::has_slots<> {
21 public: 21 public:
22 virtual ~MockXmppDelegate() {} 22 virtual ~MockXmppDelegate() {}
23 23
24 MOCK_METHOD1(OnStateChange, void(buzz::XmppEngine::State)); 24 MOCK_METHOD1(OnStateChange, void(buzz::XmppEngine::State));
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 115
116 task_pump_.reset(); 116 task_pump_.reset();
117 EXPECT_FALSE(weak_ptr.get()); 117 EXPECT_FALSE(weak_ptr.get());
118 // |weak_xmpp_client| is truly invalid at this point so we can't 118 // |weak_xmpp_client| is truly invalid at this point so we can't
119 // RaiseSignals() with it. 119 // RaiseSignals() with it.
120 } 120 }
121 121
122 } // namespace 122 } // namespace
123 123
124 } // namespace notifier 124 } // namespace notifier
OLDNEW
« no previous file with comments | « jingle/notifier/base/weak_xmpp_client.cc ('k') | jingle/notifier/base/xmpp_connection.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698