Revert 114680 - Remove FRIEND_TEST declarations to improve optimizations

base/json/json_reader.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // A JSON parser.  Converts strings of JSON into a Value object (see
 // base/values.h).
 // http://www.ietf.org/rfc/rfc4627.txt?number=4627
 //
 // Known limitations/deviations from the RFC:
 // - Only knows how to parse ints within the range of a signed 32 bit int and
@@ skipping 19 matching lines @@
 #pragma once
 
 #include <string>
 
 #include "base/base_export.h"
 #include "base/basictypes.h"
 
 // Chromium and Chromium OS check out gtest to different places, so we're
 // unable to compile on both if we include gtest_prod.h here.  Instead, include
 // its only contents -- this will need to be updated if the macro ever changes.
-#if defined(GOOGLE_CHROME_BUILD)
-
-// Provide a no-op that can live in a class definition.
-// We can't use an expression, so we define a useless local class name.
-#define FRIEND_TEST(test_case_name, test_name)                                 \
-    class test_case_name##_##test_name##_Test {int garbage;}
-
-#else
-
-#define FRIEND_TEST(test_case_name, test_name)                                 \
-    friend class test_case_name##_##test_name##_Test
-
-#endif
+#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;
@@ skipping 168 matching lines @@
   JsonParseError error_code_;
   int error_line_;
   int error_col_;
 
   DISALLOW_COPY_AND_ASSIGN(JSONReader);
 };
 
 }  // namespace base
 
 #endif  // BASE_JSON_JSON_READER_H_