Cleanup render text tests to use RenderTextTestApi.

ui/gfx/render_text_mac.h

 // 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.
 
 #ifndef UI_GFX_RENDER_TEXT_MAC_H_
 #define UI_GFX_RENDER_TEXT_MAC_H_
 
 #include <ApplicationServices/ApplicationServices.h>
 #include <stddef.h>
 #include <stdint.h>
 
 #include <string>
 #include <vector>
 
 #include "base/gtest_prod_util.h"

[msw, 2016/09/15 18:19:37]

ditto nit: remove?

[karandeepb, 2016/09/16 01:08:55]

Done.

 #include "base/mac/scoped_cftyperef.h"
 #include "base/macros.h"
 #include "ui/gfx/gfx_export.h"
 #include "ui/gfx/render_text.h"
 
 namespace gfx {
 
 // RenderTextMac is the Mac implementation of RenderText that uses CoreText for
 // layout and Skia for drawing.
 //
@@ skipping 27 matching lines @@
   size_t TextIndexToDisplayIndex(size_t index) override;
   size_t DisplayIndexToTextIndex(size_t index) override;
   bool IsValidCursorIndex(size_t index) override;
   void OnLayoutTextAttributeChanged(bool text_changed) override;
   void OnDisplayTextAttributeChanged() override;
   void OnTextColorChanged() override;
   void EnsureLayout() override;
   void DrawVisualText(internal::SkiaTextRenderer* renderer) override;
 
  private:
-  FRIEND_TEST_ALL_PREFIXES(RenderTextMacTest, Mac_ElidedText);
+  friend class RenderTextMacTest;
 
   struct TextRun {
     CTRunRef ct_run;
     SkPoint origin;
     std::vector<uint16_t> glyphs;
     std::vector<SkPoint> glyph_positions;
     SkScalar width;
     base::ScopedCFTypeRef<CTFontRef> ct_font;
     sk_sp<SkTypeface> typeface;
     SkColor foreground;
@@ skipping 54 matching lines @@
 
   // Indicates that |runs_| are valid, set by |ComputeRuns()|.
   bool runs_valid_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderTextMac);
 };
 
 }  // namespace gfx
 
 #endif  // UI_GFX_RENDER_TEXT_MAC_H_