linux: Move linux_util.h from gfx/ to ui/base/gtk.

The reason for this, is that I don't think this belongs to gfx/ directory. Also rename it to
menu_label_accelerator_util.* to make it clear what the conversion functions are about.

TEST=ui_unittests --gtest_filter=MenuLabelAcceleratorUtilTest*
R=tony@chromium.org
TBR=erg@chromium.org

Review URL: https://chromiumcodereview.appspot.com/10316013

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135373 0039d316-1c4b-4281-b951-d872f2087c98

13 files changed, 52 insertions, 58 deletions

diff --git a/chrome/browser/tab_contents/render_view_context_menu_gtk.cc b/chrome/browser/tab_contents/render_view_context_menu_gtk.cc
index c699a2c..0c3699c 100644
--- a/chrome/browser/tab_contents/render_view_context_menu_gtk.cc
+++ b/chrome/browser/tab_contents/render_view_context_menu_gtk.cc
@@ -14,8 +14,8 @@
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/context_menu_params.h"
 #include "grit/generated_resources.h"
+#include "ui/base/gtk/menu_label_accelerator_util.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/gfx/linux_util.h"
 
 using content::WebContents;
 
@@ -101,7 +101,7 @@ void RenderViewContextMenuGtk::PlatformInit() {
       if (!show_input_method_menu)
         return;
 
-      std::string label = gfx::ConvertAcceleratorsFromWindowsStyle(
+      std::string label = ui::ConvertAcceleratorsFromWindowsStyle(
           l10n_util::GetStringUTF8(IDS_CONTENT_CONTEXT_INPUT_METHODS_MENU));
       GtkWidget* menuitem = gtk_menu_item_new_with_mnemonic(label.c_str());
       GtkWidget* submenu = rwhv->BuildInputMethodsGtkMenu();
diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_sub_menu_model_gtk.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_sub_menu_model_gtk.cc
index a54211f..1e3bfef 100644
--- a/chrome/browser/ui/gtk/bookmarks/bookmark_sub_menu_model_gtk.cc
+++ b/chrome/browser/ui/gtk/bookmarks/bookmark_sub_menu_model_gtk.cc
@@ -15,8 +15,8 @@
 #include "chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.h"
 #include "chrome/browser/ui/gtk/menu_gtk.h"
 #include "grit/generated_resources.h"
+#include "ui/base/gtk/menu_label_accelerator_util.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/gfx/linux_util.h"
 
 using content::OpenURLParams;
 using content::PageNavigator;
@@ -75,7 +75,7 @@ void BookmarkNodeMenuModel::PopulateMenu() {
       // Ironically the label will end up getting converted back to UTF8 later.
       // We need to escape any Windows-style "&" characters since they will be
       // converted in MenuGtk outside of our control here.
-      const string16 label = UTF8ToUTF16(gfx::EscapeWindowsStyleAccelerators(
+      const string16 label = UTF8ToUTF16(ui::EscapeWindowsStyleAccelerators(
           bookmark_utils::BuildMenuLabelFor(child)));
       // No command id. We override ActivatedAt below to handle activations.
       AddItem(kBookmarkItemCommandId, label);
@@ -93,7 +93,7 @@ void BookmarkNodeMenuModel::AddSubMenuForNode(const BookmarkNode* node) {
   // Ironically the label will end up getting converted back to UTF8 later.
   // We need to escape any Windows-style "&" characters since they will be
   // converted in MenuGtk outside of our control here.
-  const string16 label = UTF8ToUTF16(gfx::EscapeWindowsStyleAccelerators(
+  const string16 label = UTF8ToUTF16(ui::EscapeWindowsStyleAccelerators(
       bookmark_utils::BuildMenuLabelFor(node)));
   // Don't pass in the delegate, if any. Bookmark submenus don't need one.
   BookmarkNodeMenuModel* submenu =
diff --git a/chrome/browser/ui/gtk/certificate_viewer_gtk.cc b/chrome/browser/ui/gtk/certificate_viewer_gtk.cc
index a2b1012..a19d5e0 100644
--- a/chrome/browser/ui/gtk/certificate_viewer_gtk.cc
+++ b/chrome/browser/ui/gtk/certificate_viewer_gtk.cc
@@ -19,8 +19,8 @@
 #include "grit/generated_resources.h"
 #include "net/base/x509_certificate.h"
 #include "ui/base/gtk/gtk_hig_constants.h"
+#include "ui/base/gtk/menu_label_accelerator_util.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/gfx/linux_util.h"
 #include "ui/gfx/native_widget_types.h"
 
 namespace {
@@ -170,7 +170,7 @@ CertificateViewer::CertificateViewer(
       GTK_NOTEBOOK(notebook_),
       general_page_vbox_,
       gtk_label_new_with_mnemonic(
-          gfx::ConvertAcceleratorsFromWindowsStyle(
+          ui::ConvertAcceleratorsFromWindowsStyle(
               l10n_util::GetStringUTF8(
                   IDS_CERT_INFO_GENERAL_TAB_LABEL)).c_str()));
 
@@ -178,7 +178,7 @@ CertificateViewer::CertificateViewer(
       GTK_NOTEBOOK(notebook_),
       details_page_vbox_,
       gtk_label_new_with_mnemonic(
-          gfx::ConvertAcceleratorsFromWindowsStyle(
+          ui::ConvertAcceleratorsFromWindowsStyle(
               l10n_util::GetStringUTF8(
                   IDS_CERT_INFO_DETAILS_TAB_LABEL)).c_str()));
 
@@ -640,7 +640,7 @@ void CertificateViewer::InitDetailsPage() {
   gtk_box_pack_start(GTK_BOX(details_page_vbox_), export_hbox,
                      FALSE, FALSE, 0);
   export_button_ = gtk_button_new_with_mnemonic(
-      gfx::ConvertAcceleratorsFromWindowsStyle(
+      ui::ConvertAcceleratorsFromWindowsStyle(
           l10n_util::GetStringUTF8(
               IDS_CERT_DETAILS_EXPORT_CERTIFICATE)).c_str());
   g_signal_connect(export_button_, "clicked",
diff --git a/chrome/browser/ui/gtk/global_menu_bar.cc b/chrome/browser/ui/gtk/global_menu_bar.cc
index 3001e20..6490a63 100644
--- a/chrome/browser/ui/gtk/global_menu_bar.cc
+++ b/chrome/browser/ui/gtk/global_menu_bar.cc
@@ -20,8 +20,8 @@
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "grit/generated_resources.h"
+#include "ui/base/gtk/menu_label_accelerator_util.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/gfx/linux_util.h"
 
 struct GlobalMenuBarCommand {
   int str_id;
@@ -225,7 +225,7 @@ void GlobalMenuBar::BuildGtkMenuFrom(
   gtk_widget_show(menu);
 
   GtkWidget* menu_item = gtk_menu_item_new_with_mnemonic(
-      gfx::RemoveWindowsStyleAccelerators(
+      ui::RemoveWindowsStyleAccelerators(
           l10n_util::GetStringUTF8(menu_str_id)).c_str());
 
   // Give the owner a chance to sink the reference before we add it to the menu
@@ -248,9 +248,8 @@ GtkWidget* GlobalMenuBar::BuildMenuItem(
   if (string_id == MENU_SEPARATOR) {
     menu_item = gtk_separator_menu_item_new();
   } else {
-    std::string label =
-        gfx::ConvertAcceleratorsFromWindowsStyle(
-            l10n_util::GetStringUTF8(string_id));
+    std::string label = ui::ConvertAcceleratorsFromWindowsStyle(
+        l10n_util::GetStringUTF8(string_id));
 
     if (command_id == IDC_SHOW_BOOKMARK_BAR)
       menu_item = gtk_check_menu_item_new_with_mnemonic(label.c_str());
diff --git a/chrome/browser/ui/gtk/gtk_util.cc b/chrome/browser/ui/gtk/gtk_util.cc
index 1d8b99b..b26399a 100644
--- a/chrome/browser/ui/gtk/gtk_util.cc
+++ b/chrome/browser/ui/gtk/gtk_util.cc
@@ -38,13 +38,13 @@
 #include "ui/base/gtk/gtk_compat.h"
 #include "ui/base/gtk/gtk_hig_constants.h"
 #include "ui/base/gtk/gtk_screen_util.h"
+#include "ui/base/gtk/menu_label_accelerator_util.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/text/text_elider.h"
 #include "ui/base/x/x11_util.h"
 #include "ui/gfx/image/cairo_cached_surface.h"
 #include "ui/gfx/image/image.h"
-#include "ui/gfx/linux_util.h"
 
 // These conflict with base/tracked_objects.h, so need to come last.
 #include <gdk/gdkx.h>  // NOLINT
@@ -662,7 +662,7 @@ GtkWidget* AddButtonToDialog(GtkWidget* dialog, const gchar* text,
 GtkWidget* BuildDialogButton(GtkWidget* dialog, int ids_id,
                              const gchar* stock_id) {
   GtkWidget* button = gtk_button_new_with_mnemonic(
-      gfx::ConvertAcceleratorsFromWindowsStyle(
+      ui::ConvertAcceleratorsFromWindowsStyle(
           l10n_util::GetStringUTF8(ids_id)).c_str());
   gtk_button_set_image(GTK_BUTTON(button),
                        gtk_image_new_from_stock(stock_id,
diff --git a/chrome/browser/ui/gtk/menu_gtk.cc b/chrome/browser/ui/gtk/menu_gtk.cc
index 3819eb3..c259157 100644
--- a/chrome/browser/ui/gtk/menu_gtk.cc
+++ b/chrome/browser/ui/gtk/menu_gtk.cc
@@ -18,10 +18,10 @@
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/accelerators/accelerator_gtk.h"
+#include "ui/base/gtk/menu_label_accelerator_util.h"
 #include "ui/base/models/button_menu_item_model.h"
 #include "ui/base/models/menu_model.h"
 #include "ui/gfx/gtk_util.h"
-#include "ui/gfx/linux_util.h"
 #include "webkit/glue/window_open_disposition.h"
 
 bool MenuGtk::block_activation_ = false;
@@ -306,14 +306,14 @@ void MenuGtk::ConnectSignalHandlers() {
   // take a long time or even start a nested message loop.
   g_signal_connect(menu_, "show", G_CALLBACK(OnMenuShowThunk), this);
   g_signal_connect(menu_, "hide", G_CALLBACK(OnMenuHiddenThunk), this);
-  GtkWidget *toplevel_window = gtk_widget_get_toplevel(menu_);
+  GtkWidget* toplevel_window = gtk_widget_get_toplevel(menu_);
   signal_.Connect(toplevel_window, "focus-out-event",
                   G_CALLBACK(OnMenuFocusOutThunk), this);
 }
 
 GtkWidget* MenuGtk::AppendMenuItemWithLabel(int command_id,
                                             const std::string& label) {
-  std::string converted_label = gfx::ConvertAcceleratorsFromWindowsStyle(label);
+  std::string converted_label = ui::ConvertAcceleratorsFromWindowsStyle(label);
   GtkWidget* menu_item = BuildMenuItemWithLabel(label, command_id);
   return AppendMenuItem(command_id, menu_item);
 }
@@ -321,14 +321,14 @@ GtkWidget* MenuGtk::AppendMenuItemWithLabel(int command_id,
 GtkWidget* MenuGtk::AppendMenuItemWithIcon(int command_id,
                                            const std::string& label,
                                            const SkBitmap& icon) {
-  std::string converted_label = gfx::ConvertAcceleratorsFromWindowsStyle(label);
+  std::string converted_label = ui::ConvertAcceleratorsFromWindowsStyle(label);
   GtkWidget* menu_item = BuildMenuItemWithImage(converted_label, icon);
   return AppendMenuItem(command_id, menu_item);
 }
 
 GtkWidget* MenuGtk::AppendCheckMenuItemWithLabel(int command_id,
                                                  const std::string& label) {
-  std::string converted_label = gfx::ConvertAcceleratorsFromWindowsStyle(label);
+  std::string converted_label = ui::ConvertAcceleratorsFromWindowsStyle(label);
   GtkWidget* menu_item =
       gtk_check_menu_item_new_with_mnemonic(converted_label.c_str());
   return AppendMenuItem(command_id, menu_item);
@@ -446,9 +446,8 @@ void MenuGtk::BuildSubmenuFromModel(ui::MenuModel* model, GtkWidget* menu) {
   GtkWidget* menu_item = NULL;
   for (int i = 0; i < model->GetItemCount(); ++i) {
     SkBitmap icon;
-    std::string label =
-        gfx::ConvertAcceleratorsFromWindowsStyle(
-            UTF16ToUTF8(model->GetLabelAt(i)));
+    std::string label = ui::ConvertAcceleratorsFromWindowsStyle(
+        UTF16ToUTF8(model->GetLabelAt(i)));
     bool connect_to_activate = true;
 
     switch (model->GetTypeAt(i)) {
@@ -530,7 +529,7 @@ void MenuGtk::BuildSubmenuFromModel(ui::MenuModel* model, GtkWidget* menu) {
 GtkWidget* MenuGtk::BuildButtonMenuItem(ui::ButtonMenuItemModel* model,
                                         GtkWidget* menu) {
   GtkWidget* menu_item = gtk_custom_menu_item_new(
-      gfx::RemoveWindowsStyleAccelerators(UTF16ToUTF8(model->label())).c_str());
+      ui::RemoveWindowsStyleAccelerators(UTF16ToUTF8(model->label())).c_str());
 
   // Set up the callback to the model for when it is clicked.
   g_object_set_data(G_OBJECT(menu_item), "button-model", model);
@@ -559,7 +558,7 @@ GtkWidget* MenuGtk::BuildButtonMenuItem(ui::ButtonMenuItemModel* model,
         } else {
           gtk_button_set_label(
               GTK_BUTTON(button),
-              gfx::RemoveWindowsStyleAccelerators(
+              ui::RemoveWindowsStyleAccelerators(
                   UTF16ToUTF8(model->GetLabelAt(i))).c_str());
         }
 
@@ -572,7 +571,7 @@ GtkWidget* MenuGtk::BuildButtonMenuItem(ui::ButtonMenuItemModel* model,
             model->GetCommandIdAt(i));
         gtk_button_set_label(
             GTK_BUTTON(button),
-            gfx::RemoveWindowsStyleAccelerators(
+            ui::RemoveWindowsStyleAccelerators(
                 UTF16ToUTF8(model->GetLabelAt(i))).c_str());
         SetUpButtonShowHandler(button, model, i);
         break;
@@ -814,9 +813,8 @@ void MenuGtk::SetButtonItemInfo(GtkWidget* button, gpointer userdata) {
       G_OBJECT(button), "button-model-id"));
 
   if (model->IsItemDynamicAt(index)) {
-    std::string label =
-        gfx::ConvertAcceleratorsFromWindowsStyle(
-            UTF16ToUTF8(model->GetLabelAt(index)));
+    std::string label = ui::ConvertAcceleratorsFromWindowsStyle(
+        UTF16ToUTF8(model->GetLabelAt(index)));
     gtk_button_set_label(GTK_BUTTON(button), label.c_str());
   }
 
@@ -873,9 +871,8 @@ void MenuGtk::SetMenuItemInfo(GtkWidget* widget, gpointer userdata) {
     if (model->IsVisibleAt(id)) {
       // Update the menu item label if it is dynamic.
       if (model->IsItemDynamicAt(id)) {
-        std::string label =
-            gfx::ConvertAcceleratorsFromWindowsStyle(
-                UTF16ToUTF8(model->GetLabelAt(id)));
+        std::string label = ui::ConvertAcceleratorsFromWindowsStyle(
+            UTF16ToUTF8(model->GetLabelAt(id)));
 
         gtk_menu_item_set_label(GTK_MENU_ITEM(widget), label.c_str());
         if (GTK_IS_IMAGE_MENU_ITEM(widget)) {
diff --git a/chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.cc b/chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.cc
index 304972b..22969b9 100644
--- a/chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.cc
+++ b/chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.cc
@@ -43,11 +43,11 @@
 #include "ui/base/dragdrop/gtk_dnd_util.h"
 #include "ui/base/gtk/gtk_compat.h"
 #include "ui/base/gtk/gtk_hig_constants.h"
+#include "ui/base/gtk/menu_label_accelerator_util.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/font.h"
-#include "ui/gfx/linux_util.h"
 #include "ui/gfx/skia_utils_gtk.h"
 
 using content::WebContents;
@@ -1309,7 +1309,7 @@ void OmniboxViewGtk::HandlePopulatePopup(GtkWidget* sender, GtkMenu* menu) {
 
   // Search Engine menu item.
   GtkWidget* search_engine_menuitem = gtk_menu_item_new_with_mnemonic(
-      gfx::ConvertAcceleratorsFromWindowsStyle(
+      ui::ConvertAcceleratorsFromWindowsStyle(
           l10n_util::GetStringUTF8(IDS_EDIT_SEARCH_ENGINES)).c_str());
   gtk_menu_shell_append(GTK_MENU_SHELL(menu), search_engine_menuitem);
   g_signal_connect(search_engine_menuitem, "activate",
@@ -1333,7 +1333,7 @@ void OmniboxViewGtk::HandlePopulatePopup(GtkWidget* sender, GtkMenu* menu) {
   // before is_paste_and_search() in order to set up the paste-and-go state.
   bool can_paste_and_go = model_->CanPasteAndGo(sanitized_text);
   GtkWidget* paste_go_menuitem = gtk_menu_item_new_with_mnemonic(
-      gfx::ConvertAcceleratorsFromWindowsStyle(
+      ui::ConvertAcceleratorsFromWindowsStyle(
           l10n_util::GetStringUTF8(model_->is_paste_and_search() ?
               IDS_PASTE_AND_SEARCH : IDS_PASTE_AND_GO)).c_str());
 
diff --git a/chrome/browser/ui/gtk/task_manager_gtk.cc b/chrome/browser/ui/gtk/task_manager_gtk.cc
index 23a0b5e..91982db 100644
--- a/chrome/browser/ui/gtk/task_manager_gtk.cc
+++ b/chrome/browser/ui/gtk/task_manager_gtk.cc
@@ -22,9 +22,9 @@
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/ui/gtk/gtk_chrome_link_button.h"
 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
+#include "chrome/browser/ui/gtk/gtk_theme_service.h"
 #include "chrome/browser/ui/gtk/gtk_tree.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
-#include "chrome/browser/ui/gtk/gtk_theme_service.h"
 #include "chrome/browser/ui/gtk/menu_gtk.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
@@ -32,12 +32,12 @@
 #include "grit/ui_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/gtk/gtk_hig_constants.h"
+#include "ui/base/gtk/menu_label_accelerator_util.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/gtk_util.h"
 #include "ui/gfx/image/image.h"
-#include "ui/gfx/linux_util.h"
 
 namespace {
 
@@ -453,7 +453,7 @@ void TaskManagerGtk::Init() {
   }
 
   gtk_dialog_add_button(GTK_DIALOG(dialog_),
-      gfx::ConvertAcceleratorsFromWindowsStyle(
+      ui::ConvertAcceleratorsFromWindowsStyle(
           l10n_util::GetStringUTF8(IDS_TASK_MANAGER_KILL)).c_str(),
       kTaskManagerResponseKill);
 
diff --git a/ui/gfx/linux_util.cc b/ui/base/gtk/menu_label_accelerator_util.cc
index 8484e1b..f8192c5 100644
--- a/ui/gfx/linux_util.cc
+++ b/ui/base/gtk/menu_label_accelerator_util.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/gfx/linux_util.h"
+#include "ui/base/gtk/menu_label_accelerator_util.h"
 
 #include "base/string_util.h"
 
@@ -39,7 +39,7 @@ std::string ConvertAmpersandsTo(const std::string& label,
 
 }  // namespace
 
-namespace gfx {
+namespace ui {
 
 std::string ConvertAcceleratorsFromWindowsStyle(const std::string& label) {
   return ConvertAmpersandsTo(label, "_");
@@ -59,4 +59,4 @@ std::string EscapeWindowsStyleAccelerators(const std::string& label) {
   return ret;
 }
 
-}  // namespace gfx
+}  // namespace ui
diff --git a/ui/gfx/linux_util.h b/ui/base/gtk/menu_label_accelerator_util.h
index a2136af..276a859 100644
--- a/ui/gfx/linux_util.h
+++ b/ui/base/gtk/menu_label_accelerator_util.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_GFX_LINUX_UTIL_H_
-#define UI_GFX_LINUX_UTIL_H_
+#ifndef UI_BASE_GTK_MENU_LABEL_ACCELERATOR_UTIL_H_
+#define UI_BASE_GTK_MENU_LABEL_ACCELERATOR_UTIL_H_
 #pragma once
 
 #include <string>
 
 #include "ui/base/ui_export.h"
 
-namespace gfx {
+namespace ui {
 
 // Change windows accelerator style to GTK style. (GTK uses _ for
 // accelerators.  Windows uses & with && as an escape for &.)
@@ -25,6 +25,6 @@ UI_EXPORT std::string RemoveWindowsStyleAccelerators(const std::string& label);
 // with "_" characters doubled, to escape them for GTK).
 UI_EXPORT std::string EscapeWindowsStyleAccelerators(const std::string& label);
 
-}  // namespace gfx
+}  // namespace ui
 
-#endif  // UI_GFX_LINUX_UTIL_H_
+#endif  // UI_BASE_GTK_MENU_LABEL_ACCELERATOR_UTIL_H_
diff --git a/ui/gfx/linux_util_unittest.cc b/ui/base/gtk/menu_label_accelerator_util_unittest.cc
index 781c2c0..20e978e 100644
--- a/ui/gfx/linux_util_unittest.cc
+++ b/ui/base/gtk/menu_label_accelerator_util_unittest.cc
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/gfx/linux_util.h"
+#include "ui/base/gtk/menu_label_accelerator_util.h"
 
 #include "base/basictypes.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-namespace gfx {
+namespace ui {
 
-TEST(LinuxUtilTest, ConvertAcceleratorsFromWindowsStyle) {
+TEST(MenuLabelAcceleratorTest, ConvertAcceleratorsFromWindowsStyle) {
   static const struct {
     const char* input;
     const char* output;
@@ -28,7 +28,7 @@ TEST(LinuxUtilTest, ConvertAcceleratorsFromWindowsStyle) {
   }
 }
 
-TEST(LinuxUtilTest, RemoveWindowsStyleAccelerators) {
+TEST(MenuLabelAcceleratorTest, RemoveWindowsStyleAccelerators) {
   static const struct {
     const char* input;
     const char* output;
@@ -47,7 +47,7 @@ TEST(LinuxUtilTest, RemoveWindowsStyleAccelerators) {
   }
 }
 
-TEST(LinuxUtilTest, EscapeWindowsStyleAccelerators) {
+TEST(MenuLabelAcceleratorTest, EscapeWindowsStyleAccelerators) {
   static const struct {
     const char* input;
     const char* output;
@@ -72,4 +72,4 @@ TEST(LinuxUtilTest, EscapeWindowsStyleAccelerators) {
   }
 }
 
-}  // namespace gfx
+}  // namespace ui
diff --git a/ui/ui.gyp b/ui/ui.gyp
index 55a5838..6541bf4 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -163,6 +163,8 @@
         'base/gtk/gtk_signal_registrar.h',
         'base/gtk/gtk_windowing.cc',
         'base/gtk/gtk_windowing.h',
+        'base/gtk/menu_label_accelerator_util.cc',
+        'base/gtk/menu_label_accelerator_util.h',
         'base/gtk/owned_widget_gtk.cc',
         'base/gtk/owned_widget_gtk.h',
         'base/gtk/scoped_gobject.h',
@@ -487,10 +489,6 @@
             '../build/linux/system.gyp:xext',
             '../build/linux/system.gyp:xfixes',
           ],
-          'sources': [
-            'gfx/linux_util.cc',
-            'gfx/linux_util.h',
-          ],
           'link_settings': {
             'libraries': [
               '-lXrender',  # For XRender* function calls in x11_util.cc.
diff --git a/ui/ui_unittests.gypi b/ui/ui_unittests.gypi
index 4195b05..77965dc 100644
--- a/ui/ui_unittests.gypi
+++ b/ui/ui_unittests.gypi
@@ -61,6 +61,7 @@
         'base/cocoa/focus_tracker_unittest.mm',
         'base/gtk/gtk_expanded_container_unittest.cc',
         'base/gtk/gtk_im_context_util_unittest.cc',
+        'base/gtk/menu_label_accelerator_util_unittest.cc',
         'base/l10n/l10n_util_mac_unittest.mm',
         'base/l10n/l10n_util_unittest.cc',
         'base/models/list_model_unittest.cc',
@@ -140,7 +141,6 @@
         ['OS == "linux"', {
           'sources': [
             'gfx/platform_font_pango_unittest.cc',
-            'gfx/linux_util_unittest.cc',
           ],
         }],
         ['OS == "linux" and toolkit_views==1', {