Use FRIEND_TEST_ALL_PREFIXES instead of FRIEND_TEST.

base/json/json_parser.h

Index: base/json/json_parser.h
diff --git a/base/json/json_parser.h b/base/json/json_parser.h
index b4d0b1bf977a8163cc23a413e96f585dc6c47d34..4e23beb92895950c67397b041cb9ad7923caad16 100644
--- a/base/json/json_parser.h
+++ b/base/json/json_parser.h
@@ -10,31 +10,14 @@
 #include "base/base_export.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/gtest_prod_util.h"
 #include "base/json/json_reader.h"
 #include "base/strings/string_piece.h"
 
-#if !defined(OS_CHROMEOS)
-#include "base/gtest_prod_util.h"
-#endif
-
 namespace base {
-class Value;
-}
 
-#if defined(OS_CHROMEOS)
-// Chromium and Chromium OS check out gtest to different places, so this is
-// unable to compile on both if gtest_prod.h is included here. Instead, include
-// its only contents -- this will need to be updated if the macro ever changes.
-#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)
-#endif  // OS_CHROMEOS
+class Value;
 
-namespace base {
 namespace internal {
 
 class JSONParserTest;