Move remoting-specific adapters from jingle/glue to remoting/protocol

remoting/protocol/libjingle_transport_factory.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "remoting/protocol/libjingle_transport_factory.h"
 
 #include <algorithm>
 
 #include "base/callback.h"
 #include "base/callback_helpers.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/timer/timer.h"
-#include "jingle/glue/channel_socket_adapter.h"
 #include "jingle/glue/utils.h"
 #include "net/base/net_errors.h"
+#include "remoting/protocol/channel_socket_adapter.h"
 #include "remoting/protocol/network_settings.h"
 #include "remoting/signaling/jingle_info_request.h"
 #include "third_party/webrtc/base/network.h"
 #include "third_party/webrtc/p2p/base/constants.h"
 #include "third_party/webrtc/p2p/base/p2ptransportchannel.h"
 #include "third_party/webrtc/p2p/base/port.h"
 #include "third_party/webrtc/p2p/client/basicportallocator.h"
 #include "third_party/webrtc/p2p/client/httpportallocator.h"
 
 namespace remoting {
@@ skipping 53 matching lines @@
   void NotifyConnected();
 
   // Signal handlers for cricket::TransportChannel.
   void OnRequestSignaling(cricket::TransportChannelImpl* channel);
   void OnCandidateReady(cricket::TransportChannelImpl* channel,
                         const cricket::Candidate& candidate);
   void OnRouteChange(cricket::TransportChannel* channel,
                      const cricket::Candidate& candidate);
   void OnWritableState(cricket::TransportChannel* channel);
 
-  // Callback for jingle_glue::TransportChannelSocketAdapter to notify when the
-  // socket is destroyed.
+  // Callback for TransportChannelSocketAdapter to notify when the socket is
+  // destroyed.
   void OnChannelDestroyed();
 
   void NotifyRouteChanged();
 
   // Tries to connect by restarting ICE. Called by |reconnect_timer_|.
   void TryReconnect();
 
   cricket::PortAllocator* port_allocator_;
   NetworkSettings network_settings_;
   TransportRole role_;
@@ skipping 128 matching lines @@
       FROM_HERE, base::TimeDelta::FromSeconds(kReconnectDelaySeconds),
       this, &LibjingleTransport::TryReconnect);
 
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::Bind(&LibjingleTransport::NotifyConnected,
                             weak_factory_.GetWeakPtr()));
 }
 
 void LibjingleTransport::NotifyConnected() {
   // Create net::Socket adapter for the P2PTransportChannel.
-  scoped_ptr<jingle_glue::TransportChannelSocketAdapter> socket(
-      new jingle_glue::TransportChannelSocketAdapter(channel_.get()));
+  scoped_ptr<TransportChannelSocketAdapter> socket(
+      new TransportChannelSocketAdapter(channel_.get()));
   socket->SetOnDestroyedCallback(base::Bind(
       &LibjingleTransport::OnChannelDestroyed, base::Unretained(this)));
   base::ResetAndReturn(&callback_).Run(socket.Pass());
 }
 
 void LibjingleTransport::SetRemoteCredentials(const std::string& ufrag,
                                               const std::string& password) {
   DCHECK(CalledOnValidThread());
 
   remote_ice_username_fragment_ = ufrag;
@@ skipping 215 matching lines @@
     last_jingle_info_update_time_ = base::TimeTicks::Now();
 
   while (!on_jingle_info_callbacks_.empty()) {
     on_jingle_info_callbacks_.begin()->Run();
     on_jingle_info_callbacks_.pop_front();
   }
 }
 
 }  // namespace protocol
 }  // namespace remoting