Eliminate a circular dependency by making BGRAToRGBA() generic...

chrome/common/gtk_util.cc

 // Copyright (c) 2009 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.
 
 #include "chrome/common/gtk_util.h"
 
 #include <gtk/gtk.h>
 
-#include "base/gfx/gtk_util.h"
+#include "base/linux_util.h"
 #include "skia/include/SkBitmap.h"
 
 namespace {
 
 // Callback used in RemoveAllChildren.
 void RemoveWidget(GtkWidget* widget, gpointer container) {
   gtk_container_remove(GTK_CONTAINER(container), widget);
 }
 
 void FreePixels(guchar* pixels, gpointer data) {
@@ skipping 18 matching lines @@
 }  // namespace event_utils
 
 namespace gfx {
 
 GdkPixbuf* GdkPixbufFromSkBitmap(const SkBitmap* bitmap) {
   bitmap->lockPixels();
   int width = bitmap->width();
   int height = bitmap->height();
   int stride = bitmap->rowBytes();
   const guchar* orig_data = static_cast<guchar*>(bitmap->getPixels());
-  guchar* data = BGRAToRGBA(orig_data, width, height, stride);
+  guchar* data = base::BGRAToRGBA(orig_data, width, height, stride);
 
   // This pixbuf takes ownership of our malloc()ed data and will
   // free it for us when it is destroyed.
   GdkPixbuf* pixbuf = gdk_pixbuf_new_from_data(
       data,
       GDK_COLORSPACE_RGB,  // The only colorspace gtk supports.
       true,  // There is an alpha channel.
       8,
       width, height, stride, &FreePixels, data);
 
@@ skipping 13 matching lines @@
   gtk_container_add(GTK_CONTAINER(alignment), child);
   gtk_container_add(GTK_CONTAINER(ebox), alignment);
   return ebox;
 }
 
 void RemoveAllChildren(GtkWidget* container) {
   gtk_container_foreach(GTK_CONTAINER(container), RemoveWidget, container);
 }
 
 }  // namespace gfx