Replace all usages of FRIEND_TEST() with FRIEND_TEST_ALL_PREFIXES()

BUG=105287
TEST=NONE
Review URL: http://codereview.chromium.org/8678017

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

3 files changed, 27 insertions, 21 deletions

diff --git a/base/json/json_reader.h b/base/json/json_reader.h
index e91da2e..be3aef2 100644
--- a/base/json/json_reader.h
+++ b/base/json/json_reader.h
@@ -40,6 +40,12 @@
 #define FRIEND_TEST(test_case_name, test_name)\
 friend class test_case_name##_##test_name##_Test
 
+#define FRIEND_TEST_ALL_PREFIXES(test_case_name, test_name) \
+  FRIEND_TEST(test_case_name, test_name); \
+  FRIEND_TEST(test_case_name, DISABLED_##test_name); \
+  FRIEND_TEST(test_case_name, FLAKY_##test_name); \
+  FRIEND_TEST(test_case_name, FAILS_##test_name)
+
 namespace base {
 
 class Value;
@@ -149,8 +155,8 @@ class BASE_EXPORT JSONReader {
                      bool allow_trailing_comma);
 
  private:
-  FRIEND_TEST(JSONReaderTest, Reading);
-  FRIEND_TEST(JSONReaderTest, ErrorMessages);
+  FRIEND_TEST_ALL_PREFIXES(JSONReaderTest, Reading);
+  FRIEND_TEST_ALL_PREFIXES(JSONReaderTest, ErrorMessages);
 
   static std::string FormatErrorMessage(int line, int column,
                                         const std::string& description);
diff --git a/base/metrics/field_trial.h b/base/metrics/field_trial.h
index e7a4506..5652b00 100644
--- a/base/metrics/field_trial.h
+++ b/base/metrics/field_trial.h
@@ -161,19 +161,19 @@ class BASE_EXPORT FieldTrial : public RefCounted<FieldTrial> {
 
  private:
   // Allow tests to access our innards for testing purposes.
-  FRIEND_TEST(FieldTrialTest, Registration);
-  FRIEND_TEST(FieldTrialTest, AbsoluteProbabilities);
-  FRIEND_TEST(FieldTrialTest, RemainingProbability);
-  FRIEND_TEST(FieldTrialTest, FiftyFiftyProbability);
-  FRIEND_TEST(FieldTrialTest, MiddleProbabilities);
-  FRIEND_TEST(FieldTrialTest, OneWinner);
-  FRIEND_TEST(FieldTrialTest, DisableProbability);
-  FRIEND_TEST(FieldTrialTest, Save);
-  FRIEND_TEST(FieldTrialTest, DuplicateRestore);
-  FRIEND_TEST(FieldTrialTest, MakeName);
-  FRIEND_TEST(FieldTrialTest, HashClientId);
-  FRIEND_TEST(FieldTrialTest, HashClientIdIsUniform);
-  FRIEND_TEST(FieldTrialTest, UseOneTimeRandomization);
+  FRIEND_TEST_ALL_PREFIXES(FieldTrialTest, Registration);
+  FRIEND_TEST_ALL_PREFIXES(FieldTrialTest, AbsoluteProbabilities);
+  FRIEND_TEST_ALL_PREFIXES(FieldTrialTest, RemainingProbability);
+  FRIEND_TEST_ALL_PREFIXES(FieldTrialTest, FiftyFiftyProbability);
+  FRIEND_TEST_ALL_PREFIXES(FieldTrialTest, MiddleProbabilities);
+  FRIEND_TEST_ALL_PREFIXES(FieldTrialTest, OneWinner);
+  FRIEND_TEST_ALL_PREFIXES(FieldTrialTest, DisableProbability);
+  FRIEND_TEST_ALL_PREFIXES(FieldTrialTest, Save);
+  FRIEND_TEST_ALL_PREFIXES(FieldTrialTest, DuplicateRestore);
+  FRIEND_TEST_ALL_PREFIXES(FieldTrialTest, MakeName);
+  FRIEND_TEST_ALL_PREFIXES(FieldTrialTest, HashClientId);
+  FRIEND_TEST_ALL_PREFIXES(FieldTrialTest, HashClientIdIsUniform);
+  FRIEND_TEST_ALL_PREFIXES(FieldTrialTest, UseOneTimeRandomization);
 
   friend class base::FieldTrialList;
 
diff --git a/base/metrics/histogram.h b/base/metrics/histogram.h
index 50cd90d..0b94613 100644
--- a/base/metrics/histogram.h
+++ b/base/metrics/histogram.h
@@ -417,7 +417,7 @@ class BASE_EXPORT Histogram {
 
    private:
     // Allow tests to corrupt our innards for testing purposes.
-    FRIEND_TEST(HistogramTest, CorruptSampleCounts);
+    FRIEND_TEST_ALL_PREFIXES(HistogramTest, CorruptSampleCounts);
 
     // To help identify memory corruption, we reduntantly save the number of
     // samples we've accumulated into all of our buckets.  We can compare this
@@ -580,10 +580,10 @@ class BASE_EXPORT Histogram {
 
  private:
   // Allow tests to corrupt our innards for testing purposes.
-  FRIEND_TEST(HistogramTest, CorruptBucketBounds);
-  FRIEND_TEST(HistogramTest, CorruptSampleCounts);
-  FRIEND_TEST(HistogramTest, Crc32SampleHash);
-  FRIEND_TEST(HistogramTest, Crc32TableTest);
+  FRIEND_TEST_ALL_PREFIXES(HistogramTest, CorruptBucketBounds);
+  FRIEND_TEST_ALL_PREFIXES(HistogramTest, CorruptSampleCounts);
+  FRIEND_TEST_ALL_PREFIXES(HistogramTest, Crc32SampleHash);
+  FRIEND_TEST_ALL_PREFIXES(HistogramTest, Crc32TableTest);
 
   friend class StatisticsRecorder;  // To allow it to delete duplicates.
 
@@ -874,7 +874,7 @@ class BASE_EXPORT CachedRanges {
 
  private:
   // Allow tests to corrupt our innards for testing purposes.
-  FRIEND_TEST(HistogramTest, CorruptBucketBounds);
+  FRIEND_TEST_ALL_PREFIXES(HistogramTest, CorruptBucketBounds);
 
   // A monotonically increasing list of values which determine which bucket to
   // put a sample into.  For each index, show the smallest sample that can be