Always aligns text at vertically center (Textfield, Label).

ui/views/controls/textfield/native_textfield_views_unittest.cc

 // Copyright (c) 2012 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.
 
 #include "ui/views/controls/textfield/native_textfield_views.h"
 
 #include <set>
 #include <string>
 #include <vector>
 
@@ skipping 1885 matching lines @@
 
   // Create a long press event in the selected region should start a drag.
   GestureEventForTest long_press(ui::ET_GESTURE_LONG_PRESS,
       kStringPoint.x(), kStringPoint.y(), 0);
   textfield_view_->OnGestureEvent(&long_press);
   EXPECT_TRUE(textfield_view_->CanStartDragForView(NULL,
       kStringPoint, kStringPoint));
 }
 
 TEST_F(NativeTextfieldViewsTest, GetTextfieldBaseline_FontFallbackTest) {
-#if defined(OS_WIN)
-  // This test fails on some versions of Windows because two different strings
-  // have the same baseline.
-  if (base::win::GetVersion() <= base::win::VERSION_XP ||
-      base::win::VERSION_WIN8 <= base::win::GetVersion())
-    return;
-#endif
-
   InitTextfield(Textfield::STYLE_DEFAULT);
   textfield_->SetText(UTF8ToUTF16("abc"));
   const int old_baseline = textfield_->GetBaseline();
 
   // Set text which may fall back to a font which has taller baseline than
-  // the default font.  |new_baseline| will be greater than |old_baseline|.
+  // the default font.
   textfield_->SetText(UTF8ToUTF16("\xE0\xB9\x91"));
   const int new_baseline = textfield_->GetBaseline();
 
-  EXPECT_GT(new_baseline, old_baseline);
+  // Regardless of the text, the baseline must be the same.
+  EXPECT_EQ(new_baseline, old_baseline);
 }
 
 }  // namespace views