Gtk3 UI: Rename files in libgtkui containing gtk2 in their name

chrome/browser/ui/libgtkui/skia_utils_gtk.h

Index: chrome/browser/ui/libgtkui/skia_utils_gtk.h
diff --git a/chrome/browser/ui/libgtkui/skia_utils_gtk2.h b/chrome/browser/ui/libgtkui/skia_utils_gtk.h
similarity index 74%
rename from chrome/browser/ui/libgtkui/skia_utils_gtk2.h
rename to chrome/browser/ui/libgtkui/skia_utils_gtk.h
index df2d53ac093eddcfe51815053ea8d8b69eddb140..4f184246fb763fdcf6b4b69174e18f2420ffbf3a 100644
--- a/chrome/browser/ui/libgtkui/skia_utils_gtk2.h
+++ b/chrome/browser/ui/libgtkui/skia_utils_gtk.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_LIBGTKUI_SKIA_UTILS_GTK2_H_
-#define CHROME_BROWSER_UI_LIBGTKUI_SKIA_UTILS_GTK2_H_
+#ifndef CHROME_BROWSER_UI_LIBGTKUI_SKIA_UTILS_GTK_H_
+#define CHROME_BROWSER_UI_LIBGTKUI_SKIA_UTILS_GTK_H_
 
 #include <stdint.h>
 
@@ -17,9 +17,12 @@ class SkBitmap;
 // Define a macro for creating GdkColors from RGB values.  This is a macro to
 // allow static construction of literals, etc.  Use this like:
 //   GdkColor white = GDK_COLOR_RGB(0xff, 0xff, 0xff);
-#define GDK_COLOR_RGB(r, g, b) {0, r * ::libgtkui::kSkiaToGDKMultiplier,  \
-        g * ::libgtkui::kSkiaToGDKMultiplier,                          \
-        b * ::libgtkui::kSkiaToGDKMultiplier}
+#define GDK_COLOR_RGB(r, g, b)               \
+  {                                          \
+    0, r* ::libgtkui::kSkiaToGDKMultiplier,  \
+        g* ::libgtkui::kSkiaToGDKMultiplier, \
+        b* ::libgtkui::kSkiaToGDKMultiplier  \

[Elliot Glaysher, 2016/10/27 17:07:08]

please also fix up this case of cl format gone wild. as laid out, it looks like
pointers instead of multiplication.

[Tom (Use chromium acct), 2016/10/27 17:43:19]

Done.

+  }
 
 namespace libgtkui {
 
@@ -41,4 +44,4 @@ GdkPixbuf* GdkPixbufFromSkBitmap(const SkBitmap& bitmap);
 
 }  // namespace libgtkui
 
-#endif  // CHROME_BROWSER_UI_LIBGTKUI_SKIA_UTILS_GTK2_H_
+#endif  // CHROME_BROWSER_UI_LIBGTKUI_SKIA_UTILS_GTK_H_