11 files changed, 22 insertions, 14 deletions
diff --git a/content/browser/renderer_host/p2p/socket_host_tcp.h b/content/browser/renderer_host/p2p/socket_host_tcp.h
index bb003c8..568752c 100644
--- a/content/browser/renderer_host/p2p/socket_host_tcp.h
+++ b/content/browser/renderer_host/p2p/socket_host_tcp.h
@@ -5,10 +5,12 @@
 #ifndef CONTENT_BROWSER_RENDERER_HOST_P2P_SOCKET_HOST_TCP_H_
 #define CONTENT_BROWSER_RENDERER_HOST_P2P_SOCKET_HOST_TCP_H_
 
+#include <vector>
+
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
-#include "base/scoped_ptr.h"
 #include "content/browser/renderer_host/p2p/socket_host.h"
 #include "content/common/p2p_sockets.h"
 #include "net/base/completion_callback.h"
diff --git a/content/browser/renderer_host/p2p/socket_host_tcp_server.h b/content/browser/renderer_host/p2p/socket_host_tcp_server.h
index 6b4a83a..cab922c 100644
--- a/content/browser/renderer_host/p2p/socket_host_tcp_server.h
+++ b/content/browser/renderer_host/p2p/socket_host_tcp_server.h
@@ -6,10 +6,11 @@
 #define CONTENT_BROWSER_RENDERER_HOST_P2P_SOCKET_HOST_TCP_SERVER_H_
 
 #include <map>
+#include <vector>
 
 #include "base/compiler_specific.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
-#include "base/scoped_ptr.h"
 #include "content/browser/renderer_host/p2p/socket_host.h"
 #include "content/common/p2p_sockets.h"
 #include "net/socket/tcp_server_socket.h"
diff --git a/content/browser/renderer_host/p2p/socket_host_udp.h b/content/browser/renderer_host/p2p/socket_host_udp.h
index ce6b5d7..90457a3 100644
--- a/content/browser/renderer_host/p2p/socket_host_udp.h
+++ b/content/browser/renderer_host/p2p/socket_host_udp.h
@@ -6,11 +6,12 @@
 #define CONTENT_BROWSER_RENDERER_HOST_P2P_SOCKET_HOST_UDP_H_
 
 #include <set>
+#include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
-#include "base/scoped_ptr.h"
 #include "content/browser/renderer_host/p2p/socket_host.h"
 #include "content/common/p2p_sockets.h"
 #include "net/base/ip_endpoint.h"
diff --git a/content/common/gpu/transport_texture.h b/content/common/gpu/transport_texture.h
index bf31074..c3291d2 100644
--- a/content/common/gpu/transport_texture.h
+++ b/content/common/gpu/transport_texture.h
@@ -15,7 +15,7 @@
 #include <map>
 
 #include "base/basictypes.h"
-#include "base/scoped_ptr.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/task.h"
 #include "ipc/ipc_channel.h"
 
@@ -30,7 +30,7 @@ class GLES2Decoder;
 class TransportTexture : public IPC::Channel::Listener {
  public:
   enum Format {
-    RGBA, // GL_RGBA
+    RGBA,  // GL_RGBA
   };
 
   // |channel| is the owner of this object.
diff --git a/content/ppapi_plugin/ppapi_webkitclient_impl.h b/content/ppapi_plugin/ppapi_webkitclient_impl.h
index 5c3b90e..d2d8c17 100644
--- a/content/ppapi_plugin/ppapi_webkitclient_impl.h
+++ b/content/ppapi_plugin/ppapi_webkitclient_impl.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include "base/basictypes.h"
-#include "base/scoped_ptr.h"
+#include "base/memory/scoped_ptr.h"
 #include "webkit/glue/webkitclient_impl.h"
 
 class PpapiWebKitClientImpl : public webkit_glue::WebKitClientImpl {
diff --git a/content/renderer/p2p/p2p_transport_impl.h b/content/renderer/p2p/p2p_transport_impl.h
index e427820..2f0becd 100644
--- a/content/renderer/p2p/p2p_transport_impl.h
+++ b/content/renderer/p2p/p2p_transport_impl.h
@@ -5,8 +5,10 @@
 #ifndef CONTENT_RENDERER_P2P_P2P_TRANSPORT_IMPL_H_
 #define CONTENT_RENDERER_P2P_P2P_TRANSPORT_IMPL_H_
 
+#include <string>
+
 #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"
@@ -43,7 +45,7 @@ class P2PTransportImpl : public webkit_glue::P2PTransport,
   // 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();
 
diff --git a/content/renderer/pepper_platform_video_decoder_impl.h b/content/renderer/pepper_platform_video_decoder_impl.h
index eb8bf4e..c119437 100644
--- a/content/renderer/pepper_platform_video_decoder_impl.h
+++ b/content/renderer/pepper_platform_video_decoder_impl.h
@@ -7,8 +7,8 @@
 
 #include <vector>
 
-#include "base/scoped_ptr.h"
 #include "base/memory/ref_counted.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "media/video/video_decode_accelerator.h"
 #include "webkit/plugins/ppapi/plugin_delegate.h"
diff --git a/content/renderer/v8_value_converter.cc b/content/renderer/v8_value_converter.cc
index cefbea8..d2c21cd 100644
--- a/content/renderer/v8_value_converter.cc
+++ b/content/renderer/v8_value_converter.cc
@@ -7,7 +7,7 @@
 #include <string>
 
 #include "base/logging.h"
-#include "base/scoped_ptr.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 #include "v8/include/v8.h"
 
diff --git a/content/renderer/v8_value_converter_browsertest.cc b/content/renderer/v8_value_converter_browsertest.cc
index 650927f..73edf47 100644
--- a/content/renderer/v8_value_converter_browsertest.cc
+++ b/content/renderer/v8_value_converter_browsertest.cc
@@ -4,7 +4,7 @@
 
 #include <cmath>
 
-#include "base/scoped_ptr.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 #include "content/renderer/v8_value_converter.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/content/renderer/webworker_base.h b/content/renderer/webworker_base.h
index 76f5868..37193ae 100644
--- a/content/renderer/webworker_base.h
+++ b/content/renderer/webworker_base.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -10,7 +10,7 @@
 #include <vector>
 
 #include "base/basictypes.h"
-#include "base/scoped_ptr.h"
+#include "base/memory/scoped_ptr.h"
 #include "ipc/ipc_channel.h"
 
 class ChildThread;
diff --git a/content/worker/webworker_stub.h b/content/worker/webworker_stub.h
index 06b4b10..466e4ba 100644
--- a/content/worker/webworker_stub.h
+++ b/content/worker/webworker_stub.h
@@ -6,7 +6,9 @@
 #define CONTENT_WORKER_WEBWORKER_STUB_H_
 #pragma once
 
-#include "base/scoped_ptr.h"
+#include <vector>
+
+#include "base/memory/scoped_ptr.h"
 #include "content/worker/webworker_stub_base.h"
 #include "content/worker/webworkerclient_proxy.h"
 #include "googleurl/src/gurl.h"