summaryrefslogtreecommitdiffstats
path: root/chrome/browser/shell_integration_win_unittest.cc
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-24 23:24:23 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-24 23:24:23 +0000
commitf911df5f3947379800704cb2b0193b0976336b22 (patch)
treed08ecc8ee4bb4580794294e59d702c1c0d7c0424 /chrome/browser/shell_integration_win_unittest.cc
parent04338722eaee6d09b761353fb6e937b41933ff5e (diff)
downloadchromium_src-f911df5f3947379800704cb2b0193b0976336b22.zip
chromium_src-f911df5f3947379800704cb2b0193b0976336b22.tar.gz
chromium_src-f911df5f3947379800704cb2b0193b0976336b22.tar.bz2
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
Diffstat (limited to 'chrome/browser/shell_integration_win_unittest.cc')
-rw-r--r--chrome/browser/shell_integration_win_unittest.cc4
1 files changed, 2 insertions, 2 deletions
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);