summaryrefslogtreecommitdiffstats
path: root/chrome/installer/util/shell_util_unittest.cc
diff options
context:
space:
mode:
authorstevet@chromium.org <stevet@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-06 03:46:22 +0000
committerstevet@chromium.org <stevet@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-06 03:46:22 +0000
commit4b7a2aa9bec6d0930a964880aec6d1fa3e044272 (patch)
treea53220dc95be462855e904a4f74205dc37f465b3 /chrome/installer/util/shell_util_unittest.cc
parent87a58d935007a0077082ea113bbd996375a07fa3 (diff)
downloadchromium_src-4b7a2aa9bec6d0930a964880aec6d1fa3e044272.zip
chromium_src-4b7a2aa9bec6d0930a964880aec6d1fa3e044272.tar.gz
chromium_src-4b7a2aa9bec6d0930a964880aec6d1fa3e044272.tar.bz2
Badge Windows profile shortcuts with multi-user avatar.
BUG=105110 TEST=Ensure that when Chrome on Windows creates a desktop icon for a new Profile, the icon image has the user avatar in it. Ensure that changing the Avatar changes the image in the icon. TBR=rsesek Review URL: http://codereview.chromium.org/8785006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113104 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/util/shell_util_unittest.cc')
-rw-r--r--chrome/installer/util/shell_util_unittest.cc22
1 files changed, 22 insertions, 0 deletions
diff --git a/chrome/installer/util/shell_util_unittest.cc b/chrome/installer/util/shell_util_unittest.cc
index 625010e..4df10aa 100644
--- a/chrome/installer/util/shell_util_unittest.cc
+++ b/chrome/installer/util/shell_util_unittest.cc
@@ -114,6 +114,8 @@ TEST_F(ShellUtilTest, UpdateChromeShortcutTest) {
shortcut_path.value(),
L"",
description,
+ exe_path.value(),
+ dist->GetIconIndex(),
true));
EXPECT_TRUE(VerifyChromeShortcut(exe_path.value(),
shortcut_path.value(),
@@ -138,6 +140,8 @@ TEST_F(ShellUtilTest, UpdateChromeShortcutTest) {
shortcut_path.value(),
L"",
description,
+ exe_path.value(),
+ dist->GetIconIndex(),
true));
EXPECT_TRUE(VerifyChromeShortcut(exe_path.value(),
shortcut_path.value(),
@@ -151,6 +155,8 @@ TEST_F(ShellUtilTest, UpdateChromeShortcutTest) {
shortcut_path.value(),
L"",
description2,
+ exe_path.value(),
+ dist->GetIconIndex(),
false));
EXPECT_TRUE(VerifyChromeShortcut(exe_path.value(),
shortcut_path.value(),
@@ -210,6 +216,8 @@ TEST_F(ShellUtilTest, CreateChromeDesktopShortcutTest) {
description,
L"",
L"",
+ exe_path.value(),
+ dist->GetIconIndex(),
ShellUtil::CURRENT_USER,
false,
true));
@@ -227,6 +235,8 @@ TEST_F(ShellUtilTest, CreateChromeDesktopShortcutTest) {
description,
L"",
L"",
+ exe_path.value(),
+ dist->GetIconIndex(),
ShellUtil::SYSTEM_LEVEL,
false,
true));
@@ -245,6 +255,8 @@ TEST_F(ShellUtilTest, CreateChromeDesktopShortcutTest) {
description,
L"",
L"",
+ exe_path.value(),
+ dist->GetIconIndex(),
ShellUtil::SYSTEM_LEVEL,
false,
true));
@@ -253,6 +265,8 @@ TEST_F(ShellUtilTest, CreateChromeDesktopShortcutTest) {
description,
L"",
L"",
+ exe_path.value(),
+ dist->GetIconIndex(),
ShellUtil::CURRENT_USER,
false,
true));
@@ -272,6 +286,8 @@ TEST_F(ShellUtilTest, CreateChromeDesktopShortcutTest) {
description,
L"",
L"",
+ exe_path.value(),
+ dist->GetIconIndex(),
ShellUtil::CURRENT_USER,
false,
true));
@@ -280,6 +296,8 @@ TEST_F(ShellUtilTest, CreateChromeDesktopShortcutTest) {
description,
L"",
L"",
+ exe_path.value(),
+ dist->GetIconIndex(),
ShellUtil::SYSTEM_LEVEL,
false,
true));
@@ -306,6 +324,8 @@ TEST_F(ShellUtilTest, CreateChromeDesktopShortcutTest) {
description,
default_profile_user_name,
L"--profile-directory=\"Default\"",
+ exe_path.value(),
+ dist->GetIconIndex(),
ShellUtil::CURRENT_USER,
false,
true));
@@ -319,6 +339,8 @@ TEST_F(ShellUtilTest, CreateChromeDesktopShortcutTest) {
description,
second_profile_user_name,
L"--profile-directory=\"Profile 1\"",
+ exe_path.value(),
+ dist->GetIconIndex(),
ShellUtil::CURRENT_USER,
false,
true));