summaryrefslogtreecommitdiffstats
path: root/ppapi
diff options
context:
space:
mode:
Diffstat (limited to 'ppapi')
-rw-r--r--ppapi/proxy/ppb_flash_tcp_socket_proxy.cc2
-rw-r--r--ppapi/shared_impl/font_impl.h2
-rw-r--r--ppapi/tests/test_transport.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/ppapi/proxy/ppb_flash_tcp_socket_proxy.cc b/ppapi/proxy/ppb_flash_tcp_socket_proxy.cc
index 5e5a272..1be870c 100644
--- a/ppapi/proxy/ppb_flash_tcp_socket_proxy.cc
+++ b/ppapi/proxy/ppb_flash_tcp_socket_proxy.cc
@@ -9,8 +9,8 @@
#include <map>
#include "base/logging.h"
+#include "base/memory/scoped_ptr.h"
#include "base/message_loop.h"
-#include "base/scoped_ptr.h"
#include "base/task.h"
#include "ppapi/c/pp_errors.h"
#include "ppapi/proxy/plugin_dispatcher.h"
diff --git a/ppapi/shared_impl/font_impl.h b/ppapi/shared_impl/font_impl.h
index 9117ffb..9496b16 100644
--- a/ppapi/shared_impl/font_impl.h
+++ b/ppapi/shared_impl/font_impl.h
@@ -9,7 +9,7 @@
#include <string>
#include "base/basictypes.h"
-#include "base/scoped_ptr.h"
+#include "base/memory/scoped_ptr.h"
#include "ppapi/c/pp_bool.h"
#include "ppapi/c/pp_stdint.h"
diff --git a/ppapi/tests/test_transport.h b/ppapi/tests/test_transport.h
index 2f3a8147..9d1f3eb 100644
--- a/ppapi/tests/test_transport.h
+++ b/ppapi/tests/test_transport.h
@@ -7,7 +7,7 @@
#include <string>
-#include "base/scoped_ptr.h"
+#include "base/memory/scoped_ptr.h"
#include "ppapi/tests/test_case.h"
struct PPB_Transport_Dev;