summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-01 14:30:51 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-01 14:30:51 +0000
commita918f877c38b7a0bc684a2963fba4a4341a243e8 (patch)
treeb58938b92989fa1a75e8e2b0b62c21944d4cd3bb /app
parentbe4d55fe8d843628223a7b40162007ab734d1402 (diff)
downloadchromium_src-a918f877c38b7a0bc684a2963fba4a4341a243e8.zip
chromium_src-a918f877c38b7a0bc684a2963fba4a4341a243e8.tar.gz
chromium_src-a918f877c38b7a0bc684a2963fba4a4341a243e8.tar.bz2
[GTTF] Add FRIEND_TEST_ALL_PREFIXES, a FRIEND_TEST replacement
that works with all test prefixes (DISABLED, FLAKY, FAILS). TEST=none BUG=44549 Review URL: http://codereview.chromium.org/2439001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48634 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app')
-rw-r--r--app/clipboard/clipboard.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/app/clipboard/clipboard.h b/app/clipboard/clipboard.h
index ee536f6..b149d8d 100644
--- a/app/clipboard/clipboard.h
+++ b/app/clipboard/clipboard.h
@@ -9,10 +9,10 @@
#include <string>
#include <vector>
+#include "base/gtest_prod_util.h"
#include "base/process.h"
#include "base/shared_memory.h"
#include "base/string16.h"
-#include "testing/gtest/include/gtest/gtest_prod.h"
namespace gfx {
class Size;
@@ -182,7 +182,8 @@ class Clipboard {
#endif
private:
- FRIEND_TEST(ClipboardTest, SharedBitmapTest);
+ FRIEND_TEST_ALL_PREFIXES(ClipboardTest, SharedBitmapTest);
+
void DispatchObject(ObjectType type, const ObjectMapParams& params);
void WriteText(const char* text_data, size_t text_len);