3 files changed, 10 insertions, 10 deletions
diff --git a/chrome/browser/safe_browsing/bloom_filter.h b/chrome/browser/safe_browsing/bloom_filter.h
index 2abe402..519282f 100644
--- a/chrome/browser/safe_browsing/bloom_filter.h
+++ b/chrome/browser/safe_browsing/bloom_filter.h
@@ -19,9 +19,9 @@
 
 #include <vector>
 
+#include "base/gtest_prod_util.h"
 #include "base/ref_counted.h"
 #include "chrome/browser/safe_browsing/safe_browsing_util.h"
-#include "testing/gtest/include/gtest/gtest_prod.h"
 
 class FilePath;
 
@@ -60,8 +60,8 @@ class BloomFilter : public base::RefCountedThreadSafe<BloomFilter> {
 
  private:
   friend class base::RefCountedThreadSafe<BloomFilter>;
-  FRIEND_TEST(SafeBrowsingBloomFilter, BloomFilterUse);
-  FRIEND_TEST(SafeBrowsingBloomFilter, BloomFilterFile);
+  FRIEND_TEST_ALL_PREFIXES(SafeBrowsingBloomFilter, BloomFilterUse);
+  FRIEND_TEST_ALL_PREFIXES(SafeBrowsingBloomFilter, BloomFilterFile);
 
   static const int kNumHashKeys = 20;
   static const int kFileVersion = 1;
diff --git a/chrome/browser/safe_browsing/protocol_manager.h b/chrome/browser/safe_browsing/protocol_manager.h
index 75201ae..1526fe5 100644
--- a/chrome/browser/safe_browsing/protocol_manager.h
+++ b/chrome/browser/safe_browsing/protocol_manager.h
@@ -15,6 +15,7 @@
 #include <string>
 #include <vector>
 
+#include "base/gtest_prod_util.h"
 #include "base/hash_tables.h"
 #include "base/scoped_ptr.h"
 #include "base/time.h"
@@ -24,7 +25,6 @@
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/browser/safe_browsing/safe_browsing_util.h"
 #include "chrome/common/net/url_fetcher.h"
-#include "testing/gtest/include/gtest/gtest_prod.h"
 
 class Task;
 class Timer;
@@ -44,10 +44,10 @@ struct hash<const URLFetcher*> {
 #endif
 
 class SafeBrowsingProtocolManager : public URLFetcher::Delegate {
-  // Testing friends:
-  FRIEND_TEST(SafeBrowsingProtocolManagerTest, TestBackOffTimes);
-  FRIEND_TEST(SafeBrowsingProtocolManagerTest, TestChunkStrings);
-  FRIEND_TEST(SafeBrowsingProtocolManagerTest, TestGetHashBackOffTimes);
+  FRIEND_TEST_ALL_PREFIXES(SafeBrowsingProtocolManagerTest, TestBackOffTimes);
+  FRIEND_TEST_ALL_PREFIXES(SafeBrowsingProtocolManagerTest, TestChunkStrings);
+  FRIEND_TEST_ALL_PREFIXES(SafeBrowsingProtocolManagerTest,
+                           TestGetHashBackOffTimes);
 
  public:
   // Constructs a SafeBrowsingProtocolManager for |sb_service| that issues
diff --git a/chrome/browser/safe_browsing/safe_browsing_database.h b/chrome/browser/safe_browsing/safe_browsing_database.h
index 88bf58a..90723f1 100644
--- a/chrome/browser/safe_browsing/safe_browsing_database.h
+++ b/chrome/browser/safe_browsing/safe_browsing_database.h
@@ -11,11 +11,11 @@
 #include <vector>
 
 #include "base/file_path.h"
+#include "base/gtest_prod_util.h"
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
 #include "base/time.h"
 #include "chrome/browser/safe_browsing/safe_browsing_util.h"
-#include "testing/gtest/include/gtest/gtest_prod.h"
 
 class BloomFilter;
 class GURL;
@@ -83,7 +83,7 @@ class SafeBrowsingDatabase {
   typedef base::hash_map<SBPrefix, HashList> HashCache;
 
   friend class SafeBrowsingDatabaseTest;
-  FRIEND_TEST(SafeBrowsingDatabaseTest, HashCaching);
+  FRIEND_TEST_ALL_PREFIXES(SafeBrowsingDatabaseTest, HashCaching);
 
   static FilePath BloomFilterFilename(const FilePath& db_filename);