Rework gfx::Font by moving platform-specific code into inner classes....

chrome/browser/autocomplete/autocomplete_popup_view_mac_unittest.mm

 // Copyright (c) 2010 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.
 
 #import "chrome/browser/autocomplete/autocomplete_popup_view_mac.h"
 
 #include "app/text_elider.h"
 #include "base/scoped_ptr.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete.h"
 #include "testing/platform_test.h"
 
 namespace {
 
 const float kLargeWidth = 10000;
 
 class AutocompletePopupViewMacTest : public PlatformTest {
  public:
   AutocompletePopupViewMacTest() {}
 
   virtual void SetUp() {
     PlatformTest::SetUp();
 
     // These are here because there is no autorelease pool for the
     // constructor.
     color_ = [NSColor blackColor];
-    font_ = gfx::Font::CreateFont(
+    font_ = gfx::Font(
         base::SysNSStringToWide([[NSFont userFontOfSize:12] fontName]), 12);
   }
 
   // Returns the length of the run starting at |location| for which
   // |attributeName| remains the same.
   static NSUInteger RunLengthForAttribute(NSAttributedString* string,
                                           NSUInteger location,
                                           NSString* attributeName) {
     const NSRange fullRange = NSMakeRange(0, [string length]);
     NSRange range;
@@ skipping 382 matching lines @@
 }
 
 TEST_F(AutocompletePopupViewMacTest, ElideString) {
   NSString* const contents = @"This is a test with long contents";
   const std::wstring wideContents(base::SysNSStringToWide(contents));
 
   const float kWide = 1000.0;
   const float kNarrow = 20.0;
 
   NSDictionary* attributes =
-      [NSDictionary dictionaryWithObject:font_.nativeFont()
+      [NSDictionary dictionaryWithObject:font_.GetNativeFont()
                                   forKey:NSFontAttributeName];
   scoped_nsobject<NSMutableAttributedString> as(
       [[NSMutableAttributedString alloc] initWithString:contents
                                              attributes:attributes]);
 
   // Nothing happens if the space is really wide.
   NSMutableAttributedString* ret =
       AutocompletePopupViewMac::ElideString(as, wideContents, font_, kWide);
   EXPECT_TRUE(ret == as);
   EXPECT_TRUE([[as string] isEqualToString:contents]);
@@ skipping 28 matching lines @@
   m.contents_class.push_back(
       ACMatchClassification(0, ACMatchClassification::NONE));
   m.contents_class.push_back(
       ACMatchClassification(runLength1, ACMatchClassification::MATCH));
   m.contents_class.push_back(
       ACMatchClassification(runLength1 + runLength2,
                             ACMatchClassification::URL));
 
   // Figure out the width of the contents.
   NSDictionary* attributes =
-      [NSDictionary dictionaryWithObject:font_.nativeFont()
+      [NSDictionary dictionaryWithObject:font_.GetNativeFont()
                                   forKey:NSFontAttributeName];
   const float contentsWidth = [contents sizeWithAttributes:attributes].width;
 
   // After accounting for the width of the image, this will force us
   // to elide the contents.
   float cellWidth = ceil(contentsWidth / 0.7);
 
   NSAttributedString* decorated =
       AutocompletePopupViewMac::MatchText(m, font_, cellWidth);
 
@@ skipping 33 matching lines @@
 // updates the model's selection from the matrix before returning.
 // Could possibly test that via -select:.
 
 // TODO(shess): Test that AutocompleteButtonCell returns the right
 // background colors for on, highlighted, and neither.
 
 // TODO(shess): Test that AutocompleteMatrixTarget can be initialized
 // and then sends -select: to the view.
 
 }  // namespace