Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(723)

Unified Diff: base/json/json_reader.h

Issue 546100: Remove gtest_prod.h include from JSONReader. (Closed)
Patch Set: include FRIEND_TEST() macro directly Created 10 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/json/json_reader.h
diff --git a/base/json/json_reader.h b/base/json/json_reader.h
index 9a82e7f05d014fa635a39d50e120cbd8fb8e94d2..47598f42a6e2c230717421664bda044c28c4ad1a 100644
--- a/base/json/json_reader.h
+++ b/base/json/json_reader.h
@@ -34,7 +34,12 @@
#include <string>
#include "base/basictypes.h"
-#include "testing/gtest/include/gtest/gtest_prod.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.
+#define FRIEND_TEST(test_case_name, test_name)\
+friend class test_case_name##_##test_name##_Test
class Value;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698