Even more FRIEND_TEST_ALL_PREFIXES, now like in webkit

TEST=none
BUG=44549

Review URL: http://codereview.chromium.org/3078014

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54591 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 36 insertions, 31 deletions

diff --git a/webkit/appcache/appcache.h b/webkit/appcache/appcache.h
index eab23bb..a61269f 100644
--- a/webkit/appcache/appcache.h
+++ b/webkit/appcache/appcache.h
@@ -10,10 +10,10 @@
 #include <string>
 #include <vector>
 
+#include "base/gtest_prod_util.h"
 #include "base/ref_counted.h"
 #include "base/time.h"
 #include "googleurl/src/gurl.h"
-#include "testing/gtest/include/gtest/gtest_prod.h"
 #include "webkit/appcache/appcache_database.h"
 #include "webkit/appcache/appcache_entry.h"
 #include "webkit/appcache/manifest_parser.h"
@@ -143,7 +143,8 @@ class AppCache : public base::RefCounted<AppCache> {
   // to notify service when cache is deleted
   AppCacheService* service_;
 
-  FRIEND_TEST(AppCacheTest, InitializeWithManifest);
+  FRIEND_TEST_ALL_PREFIXES(AppCacheTest, InitializeWithManifest);
+
   DISALLOW_COPY_AND_ASSIGN(AppCache);
 };
 
diff --git a/webkit/appcache/appcache_database.h b/webkit/appcache/appcache_database.h
index 1c02463..7ecc54c 100644
--- a/webkit/appcache/appcache_database.h
+++ b/webkit/appcache/appcache_database.h
@@ -10,10 +10,10 @@
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
+#include "base/gtest_prod_util.h"
 #include "base/scoped_ptr.h"
 #include "base/time.h"
 #include "googleurl/src/gurl.h"
-#include "testing/gtest/include/gtest/gtest_prod.h"
 
 namespace sql {
 class Connection;
@@ -195,15 +195,16 @@ class AppCacheDatabase {
   bool is_disabled_;
   bool is_recreating_;
 
-  FRIEND_TEST(AppCacheDatabaseTest, CacheRecords);
-  FRIEND_TEST(AppCacheDatabaseTest, EntryRecords);
-  FRIEND_TEST(AppCacheDatabaseTest, FallbackNameSpaceRecords);
-  FRIEND_TEST(AppCacheDatabaseTest, GroupRecords);
-  FRIEND_TEST(AppCacheDatabaseTest, LazyOpen);
-  FRIEND_TEST(AppCacheDatabaseTest, OnlineWhiteListRecords);
-  FRIEND_TEST(AppCacheDatabaseTest, ReCreate);
-  FRIEND_TEST(AppCacheDatabaseTest, DeletableResponseIds);
-  FRIEND_TEST(AppCacheDatabaseTest, Quotas);
+  FRIEND_TEST_ALL_PREFIXES(AppCacheDatabaseTest, CacheRecords);
+  FRIEND_TEST_ALL_PREFIXES(AppCacheDatabaseTest, EntryRecords);
+  FRIEND_TEST_ALL_PREFIXES(AppCacheDatabaseTest, FallbackNameSpaceRecords);
+  FRIEND_TEST_ALL_PREFIXES(AppCacheDatabaseTest, GroupRecords);
+  FRIEND_TEST_ALL_PREFIXES(AppCacheDatabaseTest, LazyOpen);
+  FRIEND_TEST_ALL_PREFIXES(AppCacheDatabaseTest, OnlineWhiteListRecords);
+  FRIEND_TEST_ALL_PREFIXES(AppCacheDatabaseTest, ReCreate);
+  FRIEND_TEST_ALL_PREFIXES(AppCacheDatabaseTest, DeletableResponseIds);
+  FRIEND_TEST_ALL_PREFIXES(AppCacheDatabaseTest, Quotas);
+
   DISALLOW_COPY_AND_ASSIGN(AppCacheDatabase);
 };
 
diff --git a/webkit/appcache/appcache_group.h b/webkit/appcache/appcache_group.h
index efcec48..3caa817 100644
--- a/webkit/appcache/appcache_group.h
+++ b/webkit/appcache/appcache_group.h
@@ -8,12 +8,12 @@
 #include <map>
 #include <vector>
 
+#include "base/gtest_prod_util.h"
 #include "base/observer_list.h"
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
 #include "base/task.h"
 #include "googleurl/src/gurl.h"
-#include "testing/gtest/include/gtest/gtest_prod.h"
 
 namespace appcache {
 
@@ -153,11 +153,12 @@ class AppCacheGroup : public base::RefCounted<AppCacheGroup> {
   // True if we're in our destructor.
   bool is_in_dtor_;
 
-  FRIEND_TEST(AppCacheGroupTest, StartUpdate);
-  FRIEND_TEST(AppCacheGroupTest, CancelUpdate);
-  FRIEND_TEST(AppCacheGroupTest, QueueUpdate);
-  FRIEND_TEST(AppCacheUpdateJobTest, AlreadyChecking);
-  FRIEND_TEST(AppCacheUpdateJobTest, AlreadyDownloading);
+  FRIEND_TEST_ALL_PREFIXES(AppCacheGroupTest, StartUpdate);
+  FRIEND_TEST_ALL_PREFIXES(AppCacheGroupTest, CancelUpdate);
+  FRIEND_TEST_ALL_PREFIXES(AppCacheGroupTest, QueueUpdate);
+  FRIEND_TEST_ALL_PREFIXES(AppCacheUpdateJobTest, AlreadyChecking);
+  FRIEND_TEST_ALL_PREFIXES(AppCacheUpdateJobTest, AlreadyDownloading);
+
   DISALLOW_COPY_AND_ASSIGN(AppCacheGroup);
 };
 
diff --git a/webkit/appcache/appcache_host.h b/webkit/appcache/appcache_host.h
index ff87b5f..d78ffe7 100644
--- a/webkit/appcache/appcache_host.h
+++ b/webkit/appcache/appcache_host.h
@@ -6,10 +6,10 @@
 #define WEBKIT_APPCACHE_APPCACHE_HOST_H_
 
 #include "base/callback.h"
+#include "base/gtest_prod_util.h"
 #include "base/observer_list.h"
 #include "base/ref_counted.h"
 #include "googleurl/src/gurl.h"
-#include "testing/gtest/include/gtest/gtest_prod.h"
 #include "webkit/appcache/appcache_group.h"
 #include "webkit/appcache/appcache_interfaces.h"
 #include "webkit/appcache/appcache_service.h"
@@ -208,16 +208,17 @@ class AppCacheHost : public AppCacheStorage::Delegate,
 
   friend class AppCacheRequestHandlerTest;
   friend class AppCacheUpdateJobTest;
-  FRIEND_TEST(AppCacheTest, CleanupUnusedCache);
-  FRIEND_TEST(AppCacheGroupTest, CleanupUnusedGroup);
-  FRIEND_TEST(AppCacheHostTest, Basic);
-  FRIEND_TEST(AppCacheHostTest, SelectNoCache);
-  FRIEND_TEST(AppCacheHostTest, ForeignEntry);
-  FRIEND_TEST(AppCacheHostTest, FailedCacheLoad);
-  FRIEND_TEST(AppCacheHostTest, FailedGroupLoad);
-  FRIEND_TEST(AppCacheHostTest, SetSwappableCache);
-  FRIEND_TEST(AppCacheHostTest, ForDedicatedWorker);
-  FRIEND_TEST(AppCacheGroupTest, QueueUpdate);
+  FRIEND_TEST_ALL_PREFIXES(AppCacheTest, CleanupUnusedCache);
+  FRIEND_TEST_ALL_PREFIXES(AppCacheGroupTest, CleanupUnusedGroup);
+  FRIEND_TEST_ALL_PREFIXES(AppCacheHostTest, Basic);
+  FRIEND_TEST_ALL_PREFIXES(AppCacheHostTest, SelectNoCache);
+  FRIEND_TEST_ALL_PREFIXES(AppCacheHostTest, ForeignEntry);
+  FRIEND_TEST_ALL_PREFIXES(AppCacheHostTest, FailedCacheLoad);
+  FRIEND_TEST_ALL_PREFIXES(AppCacheHostTest, FailedGroupLoad);
+  FRIEND_TEST_ALL_PREFIXES(AppCacheHostTest, SetSwappableCache);
+  FRIEND_TEST_ALL_PREFIXES(AppCacheHostTest, ForDedicatedWorker);
+  FRIEND_TEST_ALL_PREFIXES(AppCacheGroupTest, QueueUpdate);
+
   DISALLOW_COPY_AND_ASSIGN(AppCacheHost);
 };
 
diff --git a/webkit/appcache/appcache_storage.h b/webkit/appcache/appcache_storage.h
index 1126608..ae214dc 100644
--- a/webkit/appcache/appcache_storage.h
+++ b/webkit/appcache/appcache_storage.h
@@ -10,10 +10,10 @@
 
 #include "base/compiler_specific.h"
 #include "base/basictypes.h"
+#include "base/gtest_prod_util.h"
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
 #include "net/base/completion_callback.h"
-#include "testing/gtest/include/gtest/gtest_prod.h"
 #include "webkit/appcache/appcache_working_set.h"
 
 class GURL;
@@ -296,7 +296,8 @@ class AppCacheStorage {
   // The set of last ids must be retrieved from storage prior to being used.
   static const int64 kUnitializedId;
 
-  FRIEND_TEST(AppCacheStorageTest, DelegateReferences);
+  FRIEND_TEST_ALL_PREFIXES(AppCacheStorageTest, DelegateReferences);
+
   DISALLOW_COPY_AND_ASSIGN(AppCacheStorage);
 };