Merge 35197 - Fix utf8 issue in extension action context menu....

chrome/browser/extensions/extension_action_context_menu_model.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/browser/extensions/extension_action_context_menu_model.h"
 
 #include "app/l10n_util.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/url_constants.h"
 #include "grit/generated_resources.h"
 
 enum MenuEntries {
   NAME = 0,
   CONFIGURE,
   DISABLE,
   UNINSTALL,
   MANAGE,
 };
 
 ExtensionActionContextMenuModel::ExtensionActionContextMenuModel(
     Extension* extension, ExtensionInstallUI::Delegate* delegate)
   : ALLOW_THIS_IN_INITIALIZER_LIST(SimpleMenuModel(this)),
     extension_(extension),
     delegate_(delegate) {
-  AddItem(NAME, ASCIIToUTF16(extension->name()));
+  AddItem(NAME, UTF8ToUTF16(extension->name()));
   AddSeparator();
   AddItemWithStringId(CONFIGURE, IDS_EXTENSIONS_OPTIONS);
   AddItemWithStringId(DISABLE, IDS_EXTENSIONS_DISABLE);
   AddItemWithStringId(UNINSTALL, IDS_EXTENSIONS_UNINSTALL);
   AddSeparator();
 
   // TODO(finnur): It is too late in the process to do another round of
   // translations, so we'll switch fully to IDS_MANAGE_EXTENSIONS after merging
   // this to the beta branch. :/
   std::string locale = g_browser_process->GetApplicationLocale();
@@ skipping 55 matching lines @@
     case MANAGE: {
       browser->OpenURL(GURL(chrome::kChromeUIExtensionsURL), GURL(),
                        NEW_FOREGROUND_TAB, PageTransition::LINK);
       break;
     }
     default:
      NOTREACHED() << "Unknown option";
      break;
   }
 }