diff options
| author | jar@chromium.org <jar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-15 19:54:38 +0000 |
|---|---|---|
| committer | jar@chromium.org <jar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-15 19:54:38 +0000 |
| commit | cd8515971986b61f70270bbcb32a998daefbc81a (patch) | |
| tree | 9d037adab4c663117ed05acd722ba4c955214c66 /net | |
| parent | 4e5a3a54806e79871eac5cfd5b1436ebdd66bd46 (diff) | |
| download | chromium_src-cd8515971986b61f70270bbcb32a998daefbc81a.zip chromium_src-cd8515971986b61f70270bbcb32a998daefbc81a.tar.gz chromium_src-cd8515971986b61f70270bbcb32a998daefbc81a.tar.bz2 | |
Avoid including gtest file directly, and go through base instead
We should consistently:
#include "base/gtest_prod_util.h"
which does the gtest include (from the right place, in a
second repo, hidden in our tree).
This is critical to being able to supplant the FRIEND_TEST
macro, which we're experimenting with to optimize builds.
r=brettw
TBR=other owners (this is a trivial change)
BUG=107727
Review URL: http://codereview.chromium.org/8954017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114685 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/disk_cache/mem_entry_impl.h | 2 | ||||
| -rw-r--r-- | net/socket/socks5_client_socket.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/disk_cache/mem_entry_impl.h b/net/disk_cache/mem_entry_impl.h index b1d4703..cf305ba 100644 --- a/net/disk_cache/mem_entry_impl.h +++ b/net/disk_cache/mem_entry_impl.h @@ -6,11 +6,11 @@ #define NET_DISK_CACHE_MEM_ENTRY_IMPL_H_ #pragma once +#include "base/gtest_prod_util.h" #include "base/hash_tables.h" #include "base/memory/scoped_ptr.h" #include "net/base/net_log.h" #include "net/disk_cache/disk_cache.h" -#include "testing/gtest/include/gtest/gtest_prod.h" namespace disk_cache { diff --git a/net/socket/socks5_client_socket.h b/net/socket/socks5_client_socket.h index 84bb325..fb09c19 100644 --- a/net/socket/socks5_client_socket.h +++ b/net/socket/socks5_client_socket.h @@ -9,6 +9,7 @@ #include <string> #include "base/basictypes.h" +#include "base/gtest_prod_util.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "googleurl/src/gurl.h" @@ -18,7 +19,6 @@ #include "net/base/net_errors.h" #include "net/base/net_log.h" #include "net/socket/stream_socket.h" -#include "testing/gtest/include/gtest/gtest_prod.h" namespace net { |