Revert Win specific elements of 46492 to look for perf impact...

gfx/font_win.cc

Index: gfx/font_win.cc
===================================================================
--- gfx/font_win.cc	(revision 51805)
+++ gfx/font_win.cc	(working copy)
@@ -170,9 +170,18 @@
 }
 
 int Font::GetStringWidth(const std::wstring& text) const {
-  int width = 0, height = 0;
-  CanvasSkia::SizeStringInt(text, *this, &width, &height,
-                            gfx::Canvas::NO_ELLIPSIS);
+  int width = 0;
+  HDC dc = GetDC(NULL);
+  HFONT previous_font = static_cast<HFONT>(SelectObject(dc, hfont()));
+  SIZE size;
+  if (GetTextExtentPoint32(dc, text.c_str(), static_cast<int>(text.size()),
+                           &size)) {
+    width = size.cx;
+  } else {
+    width = 0;
+  }
+  SelectObject(dc, previous_font);
+  ReleaseDC(NULL, dc);
   return width;
 }