summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authortimurrrr@chromium.org <timurrrr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-14 08:24:42 +0000
committertimurrrr@chromium.org <timurrrr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-14 08:24:42 +0000
commitee857513c3a0d5c88bfd363c4203d4190fc678f5 (patch)
tree8e4ce0e72ced6eacd5711375f0a0d6bbe48c59a3 /net
parentd4db59c55fdf97bf3abd60c58824fc090e0a7b61 (diff)
downloadchromium_src-ee857513c3a0d5c88bfd363c4203d4190fc678f5.zip
chromium_src-ee857513c3a0d5c88bfd363c4203d4190fc678f5.tar.gz
chromium_src-ee857513c3a0d5c88bfd363c4203d4190fc678f5.tar.bz2
Update dynamic annotations and move them to base/third_party
Review URL: http://codereview.chromium.org/1992005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47252 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/socket/tcp_pinger.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/socket/tcp_pinger.h b/net/socket/tcp_pinger.h
index f557e25..96fa4fd 100644
--- a/net/socket/tcp_pinger.h
+++ b/net/socket/tcp_pinger.h
@@ -6,10 +6,10 @@
#define NET_SOCKET_TCP_PINGER_H_
#include "base/compiler_specific.h"
-#include "base/dynamic_annotations.h"
#include "base/ref_counted.h"
#include "base/scoped_ptr.h"
#include "base/task.h"
+#include "base/third_party/dynamic_annotations/dynamic_annotations.h"
#include "base/thread.h"
#include "base/waitable_event.h"
#include "net/base/address_list.h"