Previous change to label caused incorrect layout in Windows.

views/controls/label.cc

Index: views/controls/label.cc
diff --git a/views/controls/label.cc b/views/controls/label.cc
index 6b17338150600b0787614771dbdaa3c6e0c74b09..6da6c48e2cfb6f30b830c83632dabbf9b865d0fc 100755
--- a/views/controls/label.cc
+++ b/views/controls/label.cc
@@ -264,12 +264,7 @@ const GURL Label::GetURL() const {
 
 gfx::Size Label::GetTextSize() {
   if (!text_size_valid_) {
-    int w = 0, h = 0;
-    gfx::Canvas cc(0, 0, true);
-    int flags = is_multi_line_ ? ComputeMultiLineFlags() : 0;
-
-    cc.SizeStringInt(text_, font_, &w, &h, flags);
-    text_size_.SetSize(w, h);
+    text_size_.SetSize(font_.GetStringWidth(text_), font_.height());
     if (highlighted_)
       text_size_.Enlarge(1, 1);
     text_size_valid_ = true;