Convert GetPreferredSize from:...

chrome/browser/native_ui_contents.cc

Index: chrome/browser/native_ui_contents.cc
===================================================================
--- chrome/browser/native_ui_contents.cc	(revision 3391)
+++ chrome/browser/native_ui_contents.cc	(working copy)
@@ -593,23 +593,21 @@
 void SearchableUIContainer::Layout() {
   View::Layout();
 
-  CSize search_button_size;
-  search_button_->GetPreferredSize(&search_button_size);
+  gfx::Size search_button_size = search_button_->GetPreferredSize();
+  gfx::Size product_logo_size = product_logo_->GetPreferredSize();
 
-  CSize product_logo_size;
-  product_logo_->GetPreferredSize(&product_logo_size);
-
   int field_width = kDestinationSearchOffset + 
     kDestinationSearchWidth +
     kDestinationSmallerMargin +
-    static_cast<int>(search_button_size.cx) +
+    static_cast<int>(search_button_size.width()) +
     kDestinationSmallerMargin;
 
   product_logo_->SetBounds(std::max(width() - kProductLogo->width() - 
                                kProductLogoPadding,
                                field_width), 
                            kProductLogoPadding, 
-                           product_logo_size.cx, product_logo_size.cy);
+                           product_logo_size.width(),
+                           product_logo_size.height());
 }
 
 void SearchableUIContainer::Paint(ChromeCanvas* canvas) {