8 files changed, 15 insertions, 15 deletions
diff --git a/chrome/browser/diagnostics/diagnostics_test.cc b/chrome/browser/diagnostics/diagnostics_test.cc
index cd36c92..dfdf18f 100644
--- a/chrome/browser/diagnostics/diagnostics_test.cc
+++ b/chrome/browser/diagnostics/diagnostics_test.cc
@@ -49,5 +49,5 @@ FilePath DiagnosticTest::GetUserDefaultProfileDir() {
   FilePath path;
   if (!PathService::Get(chrome::DIR_USER_DATA, &path))
     return FilePath();
-  return path.Append(FilePath::FromWStringHack(chrome::kNotSignedInProfile));
+  return path.AppendASCII(chrome::kNotSignedInProfile);
 }
diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc
index e81b0e5..743fafb 100644
--- a/chrome/browser/profiles/profile_manager.cc
+++ b/chrome/browser/profiles/profile_manager.cc
@@ -73,8 +73,8 @@ ProfileManager::~ProfileManager() {
 FilePath ProfileManager::GetDefaultProfileDir(
     const FilePath& user_data_dir) {
   FilePath default_profile_dir(user_data_dir);
-  default_profile_dir = default_profile_dir.Append(
-      FilePath::FromWStringHack(chrome::kNotSignedInProfile));
+  default_profile_dir =
+      default_profile_dir.AppendASCII(chrome::kNotSignedInProfile);
   return default_profile_dir;
 }
 
@@ -103,8 +103,8 @@ FilePath ProfileManager::GetCurrentProfileDir() {
     return relative_profile_dir;
   }
 #endif
-  relative_profile_dir = relative_profile_dir.Append(
-      FilePath::FromWStringHack(chrome::kNotSignedInProfile));
+  relative_profile_dir =
+      relative_profile_dir.AppendASCII(chrome::kNotSignedInProfile);
   return relative_profile_dir;
 }
 
diff --git a/chrome/browser/profiles/profile_manager_unittest.cc b/chrome/browser/profiles/profile_manager_unittest.cc
index 81c99bb..42cd9c2 100644
--- a/chrome/browser/profiles/profile_manager_unittest.cc
+++ b/chrome/browser/profiles/profile_manager_unittest.cc
@@ -84,7 +84,7 @@ TEST_F(ProfileManagerTest, DefaultProfileDir) {
   cl->AppendSwitch(switches::kTestType);
 
   FilePath expected_default =
-      FilePath::FromWStringHack(chrome::kNotSignedInProfile);
+      FilePath().AppendASCII(chrome::kNotSignedInProfile);
   EXPECT_EQ(expected_default.value(),
             profile_manager.GetCurrentProfileDir().value());
 }
@@ -101,7 +101,7 @@ TEST_F(ProfileManagerTest, LoggedInProfileDir) {
   cl->AppendSwitch(switches::kTestType);
 
   FilePath expected_default =
-      FilePath::FromWStringHack(chrome::kNotSignedInProfile);
+      FilePath().AppendASCII(chrome::kNotSignedInProfile);
   EXPECT_EQ(expected_default.value(),
             profile_manager.GetCurrentProfileDir().value());
 
diff --git a/chrome/browser/shell_integration_unittest.cc b/chrome/browser/shell_integration_unittest.cc
index 1a6b9795..fa56fc5 100644
--- a/chrome/browser/shell_integration_unittest.cc
+++ b/chrome/browser/shell_integration_unittest.cc
@@ -307,7 +307,7 @@ TEST(ShellIntegrationTest, GetChromiumAppIdTest) {
   FilePath default_user_data_dir;
   chrome::GetDefaultUserDataDirectory(&default_user_data_dir);
   FilePath default_profile_path =
-      default_user_data_dir.Append(chrome::kNotSignedInProfile);
+      default_user_data_dir.AppendASCII(chrome::kNotSignedInProfile);
   EXPECT_EQ(BrowserDistribution::GetDistribution()->GetBrowserAppId(),
             ShellIntegration::GetChromiumAppId(default_profile_path));
 
diff --git a/chrome/browser/shell_integration_win.cc b/chrome/browser/shell_integration_win.cc
index ddfa8dd..0b9c32e 100644
--- a/chrome/browser/shell_integration_win.cc
+++ b/chrome/browser/shell_integration_win.cc
@@ -48,8 +48,10 @@ std::wstring GetProfileIdFromPath(const FilePath& profile_path) {
   // dir and is the default profile.
   if (chrome::GetDefaultUserDataDirectory(&default_user_data_dir) &&
       profile_path.DirName() == default_user_data_dir &&
-      profile_path.BaseName().value() == chrome::kNotSignedInProfile)
+      profile_path.BaseName().value() ==
+          ASCIIToUTF16(chrome::kNotSignedInProfile)) {
     return std::wstring();
+  }
 
   // Get joined basenames of user data dir and profile.
   std::wstring basenames = profile_path.DirName().BaseName().value() +
@@ -219,7 +221,7 @@ bool MigrateChromiumShortcutsTask::GetExpectedAppId(
   FilePath profile_path;
   if (command_line.HasSwitch(switches::kUserDataDir)) {
     profile_path =
-        command_line.GetSwitchValuePath(switches::kUserDataDir).Append(
+        command_line.GetSwitchValuePath(switches::kUserDataDir).AppendASCII(
             chrome::kNotSignedInProfile);
   }
 
diff --git a/chrome/common/chrome_constants.cc b/chrome/common/chrome_constants.cc
index 648ee3d..f1752c8 100644
--- a/chrome/common/chrome_constants.cc
+++ b/chrome/common/chrome_constants.cc
@@ -69,8 +69,7 @@ const wchar_t kStatusTrayWindowClass[] = L"Chrome_StatusTrayWindow";
 const wchar_t kMessageWindowClass[] = L"Chrome_MessageWindow";
 const wchar_t kCrashReportLog[] = L"Reported Crashes.txt";
 const wchar_t kTestingInterfaceDLL[] = L"testing_interface.dll";
-const wchar_t kNotSignedInProfile[] = L"Default";
-const wchar_t kNotSignedInID[] = L"not-signed-in";
+const char    kNotSignedInProfile[] = "Default";
 const wchar_t kBrowserResourcesDll[] = L"chrome.dll";
 const FilePath::CharType kExtensionFileExtension[] = FPL(".crx");
 const FilePath::CharType kExtensionKeyFileExtension[] = FPL(".pem");
diff --git a/chrome/common/chrome_constants.h b/chrome/common/chrome_constants.h
index 530c69d..5a4befc 100644
--- a/chrome/common/chrome_constants.h
+++ b/chrome/common/chrome_constants.h
@@ -30,8 +30,7 @@ extern const wchar_t kStatusTrayWindowClass[];
 extern const wchar_t kMessageWindowClass[];
 extern const wchar_t kCrashReportLog[];
 extern const wchar_t kTestingInterfaceDLL[];
-extern const wchar_t kNotSignedInProfile[];
-extern const wchar_t kNotSignedInID[];
+extern const char    kNotSignedInProfile[];
 extern const char    kStatsFilename[];
 extern const wchar_t kBrowserResourcesDll[];
 extern const wchar_t kNaClAppName[];
diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc
index 11314fe..83c41f4 100644
--- a/chrome/test/ui/ui_test.cc
+++ b/chrome/test/ui/ui_test.cc
@@ -627,7 +627,7 @@ DictionaryValue* UITest::GetLocalState() {
 DictionaryValue* UITest::GetDefaultProfilePreferences() {
   FilePath path;
   PathService::Get(chrome::DIR_USER_DATA, &path);
-  path = path.AppendASCII(WideToUTF8(chrome::kNotSignedInProfile));
+  path = path.AppendASCII(chrome::kNotSignedInProfile);
   return LoadDictionaryValueFromPath(path.Append(chrome::kPreferencesFilename));
 }