ui/gfx: Rename canvas_skia_skia to just canvas_skia.

ui/ui.gyp

Index: ui/ui.gyp
diff --git a/ui/ui.gyp b/ui/ui.gyp
index 2cdfbc0f625092f3489bd863e72fd797167b2ee0..d150935fe56f4cd52fcb6efb2d226cf92ec4a941 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -262,8 +262,8 @@
         'gfx/canvas_mac.mm',
         'gfx/canvas_paint.h',
         'gfx/canvas_paint_win.cc',
+        'gfx/canvas_skia.cc',
         'gfx/canvas_skia_paint.h',
-        'gfx/canvas_skia_skia.cc',
         'gfx/canvas_win.cc',
         'gfx/codec/jpeg_codec.cc',
         'gfx/codec/jpeg_codec.h',
@@ -373,18 +373,18 @@
         'ui_controls/ui_controls_win.cc',
       ],
       'conditions': [
-        # TODO(asvitkine): Switch all platforms to use canvas_skia_skia.cc.
+        # TODO(asvitkine): Switch all platforms to use canvas_skia.cc.
         #                  http://crbug.com/105550
-        ['use_canvas_skia_skia==1', {
+        ['use_canvas_skia==1', {
           'sources!': [
             'gfx/canvas_android.cc',
             'gfx/canvas_linux.cc',
             'gfx/canvas_mac.mm',
             'gfx/canvas_win.cc',
           ],
-        }, {  # use_canvas_skia_skia!=1
+        }, {  # use_canvas_skia!=1
           'sources!': [
-            'gfx/canvas_skia_skia.cc',
+            'gfx/canvas_skia.cc',
           ],
         }],
         ['use_aura==1', {
@@ -630,7 +630,7 @@
             'base/x/events_x.cc',
           ],
         }],
-        ['toolkit_views==0 and use_canvas_skia_skia==0', {
+        ['toolkit_views==0 and use_canvas_skia==0', {
           'sources!': [
             'gfx/render_text.cc',
             'gfx/render_text.h',