summaryrefslogtreecommitdiffstats
path: root/views
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-05 15:44:08 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-05 15:44:08 +0000
commit9492ea1fc55721bd2074dfa648a815b65ce06f2c (patch)
treefb16b75fa11b624f95d1616d0e8d101e91e19502 /views
parent158cb388836f677b8af043e04e68a8907227480c (diff)
downloadchromium_src-9492ea1fc55721bd2074dfa648a815b65ce06f2c.zip
chromium_src-9492ea1fc55721bd2074dfa648a815b65ce06f2c.tar.gz
chromium_src-9492ea1fc55721bd2074dfa648a815b65ce06f2c.tar.bz2
views: Use FRIEND_TEST_ALL_PREFIXES.
BUG=44549 TEST=trybots Review URL: http://codereview.chromium.org/2699003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49011 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
-rw-r--r--views/controls/label.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/views/controls/label.h b/views/controls/label.h
index 2b00912..e25494e 100644
--- a/views/controls/label.h
+++ b/views/controls/label.h
@@ -5,10 +5,10 @@
#ifndef VIEWS_CONTROLS_LABEL_H_
#define VIEWS_CONTROLS_LABEL_H_
+#include "base/gtest_prod_util.h"
#include "gfx/font.h"
#include "googleurl/src/gurl.h"
#include "third_party/skia/include/core/SkColor.h"
-#include "testing/gtest/include/gtest/gtest_prod.h"
#include "views/view.h"
namespace views {
@@ -195,10 +195,10 @@ class Label : public View {
private:
// These tests call CalculateDrawStringParams in order to verify the
// calculations done for drawing text.
- FRIEND_TEST(LabelTest, DrawSingleLineString);
- FRIEND_TEST(LabelTest, DrawMultiLineString);
- FRIEND_TEST(LabelTest, DrawSingleLineStringInRTL);
- FRIEND_TEST(LabelTest, DrawMultiLineStringInRTL);
+ FRIEND_TEST_ALL_PREFIXES(LabelTest, DrawSingleLineString);
+ FRIEND_TEST_ALL_PREFIXES(LabelTest, DrawMultiLineString);
+ FRIEND_TEST_ALL_PREFIXES(LabelTest, DrawSingleLineStringInRTL);
+ FRIEND_TEST_ALL_PREFIXES(LabelTest, DrawMultiLineStringInRTL);
static gfx::Font GetDefaultFont();