summaryrefslogtreecommitdiffstats
path: root/ipc
diff options
context:
space:
mode:
authorerg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-14 18:15:28 +0000
committererg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-14 18:15:28 +0000
commita91e1409a1b702892be19b058ad418b92ab4dd28 (patch)
treef65055a03ec7147674e921e80664be5bef9acef0 /ipc
parent1ebe3cefbab03f450586895feea998f994ff13f8 (diff)
downloadchromium_src-a91e1409a1b702892be19b058ad418b92ab4dd28.zip
chromium_src-a91e1409a1b702892be19b058ad418b92ab4dd28.tar.gz
chromium_src-a91e1409a1b702892be19b058ad418b92ab4dd28.tar.bz2
Reland r52336.
(I accidentally committed a previous version of the patch (the fixed version was in codereview since I had switched to my mac to address this exact compile failure.) BUG=none TEST=none TBR=evan Review URL: http://codereview.chromium.org/2937010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52349 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ipc')
-rw-r--r--ipc/ipc_channel_win.h1
-rw-r--r--ipc/ipc_sync_channel_unittest.cc1
2 files changed, 2 insertions, 0 deletions
diff --git a/ipc/ipc_channel_win.h b/ipc/ipc_channel_win.h
index 7610d02..31b8ad4 100644
--- a/ipc/ipc_channel_win.h
+++ b/ipc/ipc_channel_win.h
@@ -11,6 +11,7 @@
#include <string>
#include "base/message_loop.h"
+#include "base/scoped_ptr.h"
class NonThreadSafe;
diff --git a/ipc/ipc_sync_channel_unittest.cc b/ipc/ipc_sync_channel_unittest.cc
index 2566f9b..a542a8c 100644
--- a/ipc/ipc_sync_channel_unittest.cc
+++ b/ipc/ipc_sync_channel_unittest.cc
@@ -11,6 +11,7 @@
#include "base/logging.h"
#include "base/message_loop.h"
#include "base/platform_thread.h"
+#include "base/scoped_ptr.h"
#include "base/stl_util-inl.h"
#include "base/string_util.h"
#include "base/third_party/dynamic_annotations/dynamic_annotations.h"