diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-30 21:49:03 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-30 21:49:03 +0000 |
| commit | 8822f38cd5d5006033003e5197a56bed2cc33fea (patch) | |
| tree | 2d239e6b8b1557b1e90c5747b63c56238b2fb846 /net/proxy/proxy_service.h | |
| parent | c9b9f10acf2d9e8290739b10bfaf18da4ea9656c (diff) | |
| download | chromium_src-8822f38cd5d5006033003e5197a56bed2cc33fea.zip chromium_src-8822f38cd5d5006033003e5197a56bed2cc33fea.tar.gz chromium_src-8822f38cd5d5006033003e5197a56bed2cc33fea.tar.bz2 | |
More FRIEND_TEST_ALL_PREFIXES.
TEST=none
BUG=44549
Review URL: http://codereview.chromium.org/3053024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54388 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy/proxy_service.h')
| -rw-r--r-- | net/proxy/proxy_service.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/proxy/proxy_service.h b/net/proxy/proxy_service.h index 81ce871..1cb4840 100644 --- a/net/proxy/proxy_service.h +++ b/net/proxy/proxy_service.h @@ -9,6 +9,7 @@ #include <string> #include <vector> +#include "base/gtest_prod_util.h" #include "base/ref_counted.h" #include "base/scoped_ptr.h" #include "base/waitable_event.h" @@ -18,7 +19,6 @@ #include "net/proxy/proxy_config_service.h" #include "net/proxy/proxy_server.h" #include "net/proxy/proxy_info.h" -#include "testing/gtest/include/gtest/gtest_prod.h" class GURL; class MessageLoop; @@ -188,8 +188,8 @@ class ProxyService : public base::RefCountedThreadSafe<ProxyService>, private: friend class base::RefCountedThreadSafe<ProxyService>; - FRIEND_TEST(ProxyServiceTest, UpdateConfigAfterFailedAutodetect); - FRIEND_TEST(ProxyServiceTest, UpdateConfigFromPACToDirect); + FRIEND_TEST_ALL_PREFIXES(ProxyServiceTest, UpdateConfigAfterFailedAutodetect); + FRIEND_TEST_ALL_PREFIXES(ProxyServiceTest, UpdateConfigFromPACToDirect); friend class PacRequest; // TODO(eroman): change this to a std::set. Note that this requires updating |