summaryrefslogtreecommitdiffstats
path: root/remoting
diff options
context:
space:
mode:
authorbrettw <brettw@chromium.org>2015-06-01 22:34:43 -0700
committerCommit bot <commit-bot@chromium.org>2015-06-02 05:35:21 +0000
commit5a1613dcb83ac548403796eb1320d17dad52ccd8 (patch)
treefa77f970c2603db4b8b2854448e82cf8f3cce888 /remoting
parentabd18063e7b78bc50db62c1914aa729cb0daa40f (diff)
downloadchromium_src-5a1613dcb83ac548403796eb1320d17dad52ccd8.zip
chromium_src-5a1613dcb83ac548403796eb1320d17dad52ccd8.tar.gz
chromium_src-5a1613dcb83ac548403796eb1320d17dad52ccd8.tar.bz2
Move ObserverList to base namespace.
Moves ObserverList and related classes to the base namespace. ObserverList[ThreadSafe] maintains a using statement to avoid having to update all users atomically. Users of ObserverListBase are updated in this patch. BUG= CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel Review URL: https://codereview.chromium.org/1152983004 Cr-Commit-Position: refs/heads/master@{#332347}
Diffstat (limited to 'remoting')
-rw-r--r--remoting/client/plugin/delegating_signal_strategy.cc2
-rw-r--r--remoting/host/register_support_host_request_unittest.cc2
-rw-r--r--remoting/signaling/fake_signal_strategy.cc2
-rw-r--r--remoting/signaling/xmpp_signal_strategy.cc2
4 files changed, 4 insertions, 4 deletions
diff --git a/remoting/client/plugin/delegating_signal_strategy.cc b/remoting/client/plugin/delegating_signal_strategy.cc
index 9caf1ff..bb4bd93 100644
--- a/remoting/client/plugin/delegating_signal_strategy.cc
+++ b/remoting/client/plugin/delegating_signal_strategy.cc
@@ -27,7 +27,7 @@ void DelegatingSignalStrategy::OnIncomingMessage(const std::string& message) {
return;
}
- ObserverListBase<Listener>::Iterator it(&listeners_);
+ base::ObserverListBase<Listener>::Iterator it(&listeners_);
Listener* listener;
while ((listener = it.GetNext()) != nullptr) {
if (listener->OnSignalStrategyIncomingStanza(stanza.get()))
diff --git a/remoting/host/register_support_host_request_unittest.cc b/remoting/host/register_support_host_request_unittest.cc
index c848bf2..c5bb89d 100644
--- a/remoting/host/register_support_host_request_unittest.cc
+++ b/remoting/host/register_support_host_request_unittest.cc
@@ -150,7 +150,7 @@ TEST_F(RegisterSupportHostRequestTest, Send) {
result->AddElement(support_id_lifetime);
int consumed = 0;
- ObserverListBase<SignalStrategy::Listener>::Iterator it(
+ base::ObserverListBase<SignalStrategy::Listener>::Iterator it(
&signal_strategy_listeners_);
SignalStrategy::Listener* listener;
while ((listener = it.GetNext()) != nullptr) {
diff --git a/remoting/signaling/fake_signal_strategy.cc b/remoting/signaling/fake_signal_strategy.cc
index 8b78fff..996845c 100644
--- a/remoting/signaling/fake_signal_strategy.cc
+++ b/remoting/signaling/fake_signal_strategy.cc
@@ -145,7 +145,7 @@ void FakeSignalStrategy::OnIncomingMessage(
return;
}
- ObserverListBase<Listener>::Iterator it(&listeners_);
+ base::ObserverListBase<Listener>::Iterator it(&listeners_);
Listener* listener;
while ((listener = it.GetNext()) != nullptr) {
if (listener->OnSignalStrategyIncomingStanza(stanza_ptr))
diff --git a/remoting/signaling/xmpp_signal_strategy.cc b/remoting/signaling/xmpp_signal_strategy.cc
index b461266..693ce19 100644
--- a/remoting/signaling/xmpp_signal_strategy.cc
+++ b/remoting/signaling/xmpp_signal_strategy.cc
@@ -304,7 +304,7 @@ void XmppSignalStrategy::Core::OnStanza(
const scoped_ptr<buzz::XmlElement> stanza) {
DCHECK(thread_checker_.CalledOnValidThread());
- ObserverListBase<Listener>::Iterator it(&listeners_);
+ base::ObserverListBase<Listener>::Iterator it(&listeners_);
for (Listener* listener = it.GetNext(); listener; listener = it.GetNext()) {
if (listener->OnSignalStrategyIncomingStanza(stanza.get()))
return;