From f911df5f3947379800704cb2b0193b0976336b22 Mon Sep 17 00:00:00 2001 From: "avi@chromium.org" Date: Tue, 24 Dec 2013 23:24:23 +0000 Subject: Update some uses of UTF conversions in chrome/browser to use the base:: namespace. BUG=330556 TEST=no change TBR=ben@chromium.org Review URL: https://codereview.chromium.org/120983002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242465 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/shell_integration_win_unittest.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'chrome/browser/shell_integration_win_unittest.cc') diff --git a/chrome/browser/shell_integration_win_unittest.cc b/chrome/browser/shell_integration_win_unittest.cc index 2c63b5c..fc432ff 100644 --- a/chrome/browser/shell_integration_win_unittest.cc +++ b/chrome/browser/shell_integration_win_unittest.cc @@ -67,8 +67,8 @@ class ShellIntegrationWinMigrateShortcutTest : public testing::Test { extension_id_ = L"chromiumexampleappidforunittests"; base::string16 app_name = - UTF8ToUTF16(web_app::GenerateApplicationNameFromExtensionId( - UTF16ToUTF8(extension_id_))); + base::UTF8ToUTF16(web_app::GenerateApplicationNameFromExtensionId( + base::UTF16ToUTF8(extension_id_))); extension_app_id_ = ShellIntegration::GetAppModelIdForProfile(app_name, default_profile_path); -- cgit v1.1