diff options
| author | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-21 19:46:27 +0000 |
|---|---|---|
| committer | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-21 19:46:27 +0000 |
| commit | c646aed1426646854532c8d90f8c7a35667081c2 (patch) | |
| tree | 4e1686261bf1e265b8a52a2907be6a5482f87198 /base/json | |
| parent | 0477554f0623c67b163f6fb5cf1ce2c0d53ee4aa (diff) | |
| download | chromium_src-c646aed1426646854532c8d90f8c7a35667081c2.zip chromium_src-c646aed1426646854532c8d90f8c7a35667081c2.tar.gz chromium_src-c646aed1426646854532c8d90f8c7a35667081c2.tar.bz2 | |
Remove gtest_prod.h include from JSONReader.
I'd like to build this code for Chrome OS, but the gtest
include path is different there. I'm removing the include
and adding the FRIEND_TEST() macro directly to json_reader.h.
BUG=none
TEST=compiled
Review URL: http://codereview.chromium.org/546100
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36775 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/json')
| -rw-r--r-- | base/json/json_reader.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/base/json/json_reader.h b/base/json/json_reader.h index 9a82e7f..47598f4 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; |