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

7 files changed, 21 insertions, 18 deletions

diff --git a/net/base/cookie_monster.h b/net/base/cookie_monster.h
index ab479c4..8172857 100644
--- a/net/base/cookie_monster.h
+++ b/net/base/cookie_monster.h
@@ -14,13 +14,13 @@
 #include <vector>
 
 #include "base/basictypes.h"
+#include "base/gtest_prod_util.h"
 #include "base/histogram.h"
 #include "base/lock.h"
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
 #include "base/time.h"
 #include "net/base/cookie_store.h"
-#include "testing/gtest/include/gtest/gtest_prod.h"
 
 class GURL;
 
@@ -158,8 +158,10 @@ class CookieMonster : public CookieStore {
 
   // Testing support.
   friend class CookieMonsterTest;
-  FRIEND_TEST(CookieMonsterTest, TestCookieDeleteAllCreatedAfterTimestamp);
-  FRIEND_TEST(CookieMonsterTest, TestCookieDeleteAllCreatedBetweenTimestamps);
+  FRIEND_TEST_ALL_PREFIXES(CookieMonsterTest,
+                           TestCookieDeleteAllCreatedAfterTimestamp);
+  FRIEND_TEST_ALL_PREFIXES(CookieMonsterTest,
+                           TestCookieDeleteAllCreatedBetweenTimestamps);
   bool SetCookieWithCreationTime(const GURL& url,
                                  const std::string& cookie_line,
                                  const base::Time& creation_time);
diff --git a/net/base/filter.h b/net/base/filter.h
index db0ef9d..d00a351 100644
--- a/net/base/filter.h
+++ b/net/base/filter.h
@@ -34,10 +34,10 @@
 #include <vector>
 
 #include "base/basictypes.h"
+#include "base/gtest_prod_util.h"
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
 #include "base/time.h"
-#include "testing/gtest/include/gtest/gtest_prod.h"
 
 class GURL;
 
@@ -201,7 +201,7 @@ class Filter {
  protected:
   explicit Filter(const FilterContext& filter_context);
 
-  FRIEND_TEST(SdchFilterTest, ContentTypeId);
+  FRIEND_TEST_ALL_PREFIXES(SdchFilterTest, ContentTypeId);
   // Filters the data stored in stream_buffer_ and writes the output into the
   // dest_buffer passed in.
   //
diff --git a/net/base/host_cache.h b/net/base/host_cache.h
index 81e4cd7..aedc499 100644
--- a/net/base/host_cache.h
+++ b/net/base/host_cache.h
@@ -9,12 +9,12 @@
 #include <map>
 #include <string>
 
+#include "base/gtest_prod_util.h"
 #include "base/non_thread_safe.h"
 #include "base/ref_counted.h"
 #include "base/time.h"
 #include "net/base/address_family.h"
 #include "net/base/address_list.h"
-#include "testing/gtest/include/gtest/gtest_prod.h"
 
 namespace net {
 
@@ -111,8 +111,8 @@ class HostCache : public NonThreadSafe {
   const EntryMap& entries() const;
 
  private:
-  FRIEND_TEST(HostCacheTest, Compact);
-  FRIEND_TEST(HostCacheTest, NoCache);
+  FRIEND_TEST_ALL_PREFIXES(HostCacheTest, Compact);
+  FRIEND_TEST_ALL_PREFIXES(HostCacheTest, NoCache);
 
   // Returns true if this cache entry's result is valid at time |now|.
   static bool CanUseEntry(const Entry* entry, const base::TimeTicks now);
diff --git a/net/base/sdch_manager.h b/net/base/sdch_manager.h
index 74e38ca..4dd43ae 100644
--- a/net/base/sdch_manager.h
+++ b/net/base/sdch_manager.h
@@ -25,11 +25,11 @@
 #include <set>
 #include <string>
 
+#include "base/gtest_prod_util.h"
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
 #include "base/time.h"
 #include "googleurl/src/gurl.h"
-#include "testing/gtest/include/gtest/gtest_prod.h"
 
 //------------------------------------------------------------------------------
 // Create a public interface to help us load SDCH dictionaries.
@@ -166,7 +166,7 @@ class SdchManager {
    private:
     friend class base::RefCounted<Dictionary>;
     friend class SdchManager;  // Only manager can construct an instance.
-    FRIEND_TEST(SdchFilterTest, PathMatch);
+    FRIEND_TEST_ALL_PREFIXES(SdchFilterTest, PathMatch);
 
     // Construct a vc-diff usable dictionary from the dictionary_text starting
     // at the given offset.  The supplied client_hash should be used to
diff --git a/net/base/transport_security_state.h b/net/base/transport_security_state.h
index 9cb2884..67c47e3 100644
--- a/net/base/transport_security_state.h
+++ b/net/base/transport_security_state.h
@@ -10,10 +10,10 @@
 #include <string>
 
 #include "base/basictypes.h"
+#include "base/gtest_prod_util.h"
 #include "base/lock.h"
 #include "base/ref_counted.h"
 #include "base/time.h"
-#include "testing/gtest/include/gtest/gtest_prod.h"
 
 class GURL;
 
@@ -93,7 +93,7 @@ class TransportSecurityState :
 
  private:
   friend class base::RefCountedThreadSafe<TransportSecurityState>;
-  FRIEND_TEST(TransportSecurityStateTest, IsPreloaded);
+  FRIEND_TEST_ALL_PREFIXES(TransportSecurityStateTest, IsPreloaded);
 
   ~TransportSecurityState() {}
 
diff --git a/net/base/upload_data.h b/net/base/upload_data.h
index d139e18..01ca0da 100644
--- a/net/base/upload_data.h
+++ b/net/base/upload_data.h
@@ -10,11 +10,11 @@
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
+#include "base/gtest_prod_util.h"
 #include "base/logging.h"
 #include "base/ref_counted.h"
 #include "net/base/file_stream.h"
 #include "base/time.h"
-#include "testing/gtest/include/gtest/gtest_prod.h"
 
 namespace net {
 
@@ -102,8 +102,9 @@ class UploadData : public base::RefCounted<UploadData> {
     uint64 content_length_;
     FileStream* file_stream_;
 
-    FRIEND_TEST(UploadDataStreamTest, FileSmallerThanLength);
-    FRIEND_TEST(HttpNetworkTransactionTest, UploadFileSmallerThanLength);
+    FRIEND_TEST_ALL_PREFIXES(UploadDataStreamTest, FileSmallerThanLength);
+    FRIEND_TEST_ALL_PREFIXES(HttpNetworkTransactionTest,
+                             UploadFileSmallerThanLength);
   };
 
   void AppendBytes(const char* bytes, int bytes_len) {
diff --git a/net/base/x509_certificate.h b/net/base/x509_certificate.h
index 58b32bc..ec5105a 100644
--- a/net/base/x509_certificate.h
+++ b/net/base/x509_certificate.h
@@ -11,10 +11,10 @@
 #include <string>
 #include <vector>
 
+#include "base/gtest_prod_util.h"
 #include "base/ref_counted.h"
 #include "base/time.h"
 #include "net/base/x509_cert_types.h"
-#include "testing/gtest/include/gtest/gtest_prod.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
@@ -249,8 +249,8 @@ class X509Certificate : public base::RefCountedThreadSafe<X509Certificate> {
 
  private:
   friend class base::RefCountedThreadSafe<X509Certificate>;
-  FRIEND_TEST(X509CertificateTest, Cache);
-  FRIEND_TEST(X509CertificateTest, IntermediateCertificates);
+  FRIEND_TEST_ALL_PREFIXES(X509CertificateTest, Cache);
+  FRIEND_TEST_ALL_PREFIXES(X509CertificateTest, IntermediateCertificates);
 
   class Cache;