Index: chrome/browser/shell_integration_unittest.cc |
diff --git a/chrome/browser/shell_integration_unittest.cc b/chrome/browser/shell_integration_unittest.cc |
index 714e295096e6ae0e3135d85e23a09989bf82709d..bba4cc5b2e91ff4279ef79bc097dac15dc5b50c0 100644 |
--- a/chrome/browser/shell_integration_unittest.cc |
+++ b/chrome/browser/shell_integration_unittest.cc |
@@ -365,27 +365,29 @@ TEST(ShellIntegrationTest, GetDesktopFileContents) { |
} |
} |
#elif defined(OS_WIN) |
-TEST(ShellIntegrationTest, GetChromiumAppIdTest) { |
+TEST(ShellIntegrationTest, GetAppModelIdTest) { |
gab
2012/06/18 03:15:25
All of the logic tested below was actually the log
|
+ const string16 base_app_id( |
+ BrowserDistribution::GetDistribution()->GetBaseAppId()); |
+ |
// Empty profile path should get chrome::kBrowserAppID |
FilePath empty_path; |
- EXPECT_EQ(BrowserDistribution::GetDistribution()->GetBrowserAppId(), |
- ShellIntegration::GetChromiumAppId(empty_path)); |
+ EXPECT_EQ(base_app_id, |
+ ShellIntegration::GetAppModelId(base_app_id, empty_path)); |
// Default profile path should get chrome::kBrowserAppID |
FilePath default_user_data_dir; |
chrome::GetDefaultUserDataDirectory(&default_user_data_dir); |
FilePath default_profile_path = |
default_user_data_dir.AppendASCII(chrome::kInitialProfile); |
- EXPECT_EQ(BrowserDistribution::GetDistribution()->GetBrowserAppId(), |
- ShellIntegration::GetChromiumAppId(default_profile_path)); |
+ EXPECT_EQ(base_app_id, |
+ ShellIntegration::GetAppModelId(base_app_id, default_profile_path)); |
// Non-default profile path should get chrome::kBrowserAppID joined with |
// profile info. |
FilePath profile_path(FILE_PATH_LITERAL("root")); |
profile_path = profile_path.Append(FILE_PATH_LITERAL("udd")); |
profile_path = profile_path.Append(FILE_PATH_LITERAL("User Data - Test")); |
- EXPECT_EQ(BrowserDistribution::GetDistribution()->GetBrowserAppId() + |
- L".udd.UserDataTest", |
- ShellIntegration::GetChromiumAppId(profile_path)); |
+ EXPECT_EQ(base_app_id + L".udd.UserDataTest", |
+ ShellIntegration::GetAppModelId(base_app_id, profile_path)); |
} |
#endif |