Cleanup: base/scoped_ptr.h -> base/memory/scoped_ptr.h. (part 2)

content/renderer/p2p/p2p_transport_impl.h

 // Copyright (c) 2011 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.
 
 #ifndef CONTENT_RENDERER_P2P_P2P_TRANSPORT_IMPL_H_
 #define CONTENT_RENDERER_P2P_P2P_TRANSPORT_IMPL_H_
 
+#include <string>
+#include <vector>

[levin, 2011/06/14 07:35:05]

I don't see any uses of vector in this header.

[Lei Zhang, 2011/06/14 18:57:35]

Removed.

+
 #include "base/basictypes.h"
-#include "base/scoped_ptr.h"
+#include "base/memory/scoped_ptr.h"
 #include "net/base/completion_callback.h"
 #include "third_party/libjingle/source/talk/base/sigslot.h"
 #include "webkit/glue/p2p_transport.h"
 
 class P2PSocketDispatcher;
 
 namespace cricket {
 class Candidate;
 class PortAllocator;
 class P2PTransportChannel;
@@ skipping 16 matching lines @@
  public:
   // Create P2PTransportImpl using specified NetworkManager and
   // PacketSocketFactory. Takes ownership of |network_manager| and
   // |socket_factory|.
   P2PTransportImpl(talk_base::NetworkManager* network_manager,
                    talk_base::PacketSocketFactory* socket_factory);
 
   // Creates P2PTransportImpl using specified
   // P2PSocketDispatcher. This constructor creates IpcNetworkManager
   // and IpcPacketSocketFactory, and keeps ownership of these objects.
-  P2PTransportImpl(P2PSocketDispatcher* socket_dispatcher);
+  explicit P2PTransportImpl(P2PSocketDispatcher* socket_dispatcher);
 
   virtual ~P2PTransportImpl();
 
   // webkit_glue::P2PTransport interface.
   virtual bool Init(const std::string& name,
                     Protocol protocol,
                     const std::string& config,
                     EventHandler* event_handler) OVERRIDE;
   virtual bool AddRemoteCandidate(const std::string& address) OVERRIDE;
   virtual net::Socket* GetChannel() OVERRIDE;
@@ skipping 25 matching lines @@
 
   scoped_ptr<jingle_glue::TransportChannelSocketAdapter> channel_adapter_;
   scoped_ptr<jingle_glue::PseudoTcpAdapter> pseudo_tcp_adapter_;
 
   net::CompletionCallbackImpl<P2PTransportImpl> connect_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(P2PTransportImpl);
 };
 
 #endif  // CONTENT_RENDERER_P2P_P2P_TRANSPORT_IMPL_H_