diff options
| author | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-11 00:13:56 +0000 |
|---|---|---|
| committer | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-11 00:13:56 +0000 |
| commit | 1caa9261639f9275071d172ba2711bb792093d55 (patch) | |
| tree | 4b82d5bc2652dfe4f86ed124e6ce4f7bbfaf6e0a /chrome/browser/shell_integration_unittest.cc | |
| parent | bc1eae2c47e4bda12bf2319ee9547a690870744f (diff) | |
| download | chromium_src-1caa9261639f9275071d172ba2711bb792093d55.zip chromium_src-1caa9261639f9275071d172ba2711bb792093d55.tar.gz chromium_src-1caa9261639f9275071d172ba2711bb792093d55.tar.bz2 | |
Win: Use different AppUserModelID for SxS installs.
BUG=44572
TEST=see bug
Review URL: http://codereview.chromium.org/2616002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49477 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/shell_integration_unittest.cc')
| -rw-r--r-- | chrome/browser/shell_integration_unittest.cc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/chrome/browser/shell_integration_unittest.cc b/chrome/browser/shell_integration_unittest.cc index 4776d8d..f17680f 100644 --- a/chrome/browser/shell_integration_unittest.cc +++ b/chrome/browser/shell_integration_unittest.cc @@ -18,7 +18,9 @@ #include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" -#if defined(OS_LINUX) +#if defined(OS_WIN) +#include "chrome/installer/util/browser_distribution.h" +#elif defined(OS_LINUX) #include "base/env_var.h" #endif // defined(OS_LINUX) @@ -285,7 +287,7 @@ TEST(ShellIntegrationTest, GetDesktopFileContents) { TEST(ShellIntegrationTest, GetChromiumAppIdTest) { // Empty profile path should get chrome::kBrowserAppID FilePath empty_path; - EXPECT_EQ(std::wstring(chrome::kBrowserAppID), + EXPECT_EQ(BrowserDistribution::GetDistribution()->GetBrowserAppId(), ShellIntegration::GetChromiumAppId(empty_path)); // Default profile path should get chrome::kBrowserAppID @@ -293,7 +295,7 @@ TEST(ShellIntegrationTest, GetChromiumAppIdTest) { chrome::GetDefaultUserDataDirectory(&default_user_data_dir); FilePath default_profile_path = default_user_data_dir.Append(chrome::kNotSignedInProfile); - EXPECT_EQ(std::wstring(chrome::kBrowserAppID), + EXPECT_EQ(BrowserDistribution::GetDistribution()->GetBrowserAppId(), ShellIntegration::GetChromiumAppId(default_profile_path)); // Non-default profile path should get chrome::kBrowserAppID joined with @@ -301,7 +303,8 @@ TEST(ShellIntegrationTest, GetChromiumAppIdTest) { 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(std::wstring(chrome::kBrowserAppID) + L".udd.UserDataTest", + EXPECT_EQ(BrowserDistribution::GetDistribution()->GetBrowserAppId() + + L".udd.UserDataTest", ShellIntegration::GetChromiumAppId(profile_path)); } #endif |