Remove last dependencies on ui/base from ui/gfx

ui/gfx/utf16_indexing.h

Index: ui/gfx/utf16_indexing.h
diff --git a/ui/gfx/utf16_indexing.h b/ui/gfx/utf16_indexing.h
index 7f56384299f390d9a664284cc612e21762318ac7..a9eaea2dd9aaedceb7b9ecd554bb407b455af481 100644
--- a/ui/gfx/utf16_indexing.h
+++ b/ui/gfx/utf16_indexing.h
@@ -12,7 +12,7 @@ namespace gfx {
 
 // Returns false if s[index-1] is a high surrogate and s[index] is a low
 // surrogate, true otherwise.
-UI_EXPORT bool IsValidCodePointIndex(const string16& s, size_t index);
+GFX_EXPORT bool IsValidCodePointIndex(const string16& s, size_t index);
 
 // |UTF16IndexToOffset| returns the number of code points between |base| and
 // |pos| in the given string. |UTF16OffsetToIndex| returns the index that is
@@ -37,12 +37,12 @@ UI_EXPORT bool IsValidCodePointIndex(const string16& s, size_t index);
 //   Always,
 //     UTF16IndexToOffset(s, base, UTF16OffsetToIndex(s, base, ofs)) == ofs
 //     UTF16IndexToOffset(s, i, j) == -UTF16IndexToOffset(s, j, i)
-UI_EXPORT ptrdiff_t UTF16IndexToOffset(const string16& s,
-                                       size_t base,
-                                       size_t pos);
-UI_EXPORT size_t UTF16OffsetToIndex(const string16& s,
-                                    size_t base,
-                                    ptrdiff_t offset);
+GFX_EXPORT ptrdiff_t UTF16IndexToOffset(const string16& s,
+                                        size_t base,
+                                        size_t pos);
+GFX_EXPORT size_t UTF16OffsetToIndex(const string16& s,
+                                     size_t base,
+                                     ptrdiff_t offset);
 
 }  // namespace gfx