Don't update Canary shortcuts from Dev/Beta/Stable installer.

Don't update Canary shortcuts from Dev/Beta/Stable installer.

Before this change, UpdatePerUserShortcutsInLocation() looked for
shortcuts pointing to |install dir|(.*)chrome\.exe and updated them
to point to the chrome.exe of the current installation. Unfortunately,
for a user-level dev/beta/stable installation, |install dir| is
something like "C:\Users\...\Google\Chrome", which means that
"C:\Users\...\Google\Chrome SxS\chrome.exe" is matched.

With this CL, a dev/beta/stable installer will no longer try to update
shortcuts pointing to a Canary installation.

BUG=595374
Committed: https://crrev.com/a31042286f1978cfed1546b500db62a96fa9e5c6
Cr-Commit-Position: refs/heads/master@{#381642}

[fdoray, 2016-03-16 16:22:43]

fdoray@chromium.org changed reviewers:
+ gab@chromium.org, grt@chromium.org

[fdoray, 2016-03-16 16:22:44]

gab@ or grt@: Can you review this CL?

Doesn't fix the broken shortcuts, but ensures that the installer won't break
more shortcuts... I've seen the discussions about improving test_installer. Can
we do that in a separate CL?

[fdoray, 2016-03-16 17:59:58]

Description was changed from

==========
Don't update Canary shortcuts from Dev/Beta/Stable installer.

Before this change, UpdatePerUserShortcutsInLocation() looked for
shortcuts pointing to |install dir|(.*)chrome\.exe and updated them
to point to the chrome.exe of the current installation. Unfortunately,
for a user-level dev/beta/stable installation, |install dir| is
something like "C:\Users\...\Google\Chrome", which means that
"C:\Users\...\Google\Chrome SxS\chrome.exe" is matched.

With this CL, a dev/beta/stable installer will no longer try to update
shortcuts pointing to a Canary installation.

BUG=592040
==========

to

==========
Don't update Canary shortcuts from Dev/Beta/Stable installer.

Before this change, UpdatePerUserShortcutsInLocation() looked for
shortcuts pointing to |install dir|(.*)chrome\.exe and updated them
to point to the chrome.exe of the current installation. Unfortunately,
for a user-level dev/beta/stable installation, |install dir| is
something like "C:\Users\...\Google\Chrome", which means that
"C:\Users\...\Google\Chrome SxS\chrome.exe" is matched.

With this CL, a dev/beta/stable installer will no longer try to update
shortcuts pointing to a Canary installation.

BUG=595374
==========

[gab, 2016-03-16 21:57:31]

lgtm for fix and test w/ a follow-up to have a custom function that fixes the
broken Canary shortcuts based on their icon path or something (with a TODO to
remove it in say 1 month).

https://codereview.chromium.org/1803383002/diff/1/chrome/installer/setup/inst...
File chrome/installer/setup/install.h (right):

https://codereview.chromium.org/1803383002/diff/1/chrome/installer/setup/inst...
chrome/installer/setup/install.h:56: // - Whose paths ends with
|old_target_path_suffix|.
s/paths/path/

https://codereview.chromium.org/1803383002/diff/1/chrome/installer/setup/inst...
File chrome/installer/setup/install_unittest.cc (right):

https://codereview.chromium.org/1803383002/diff/1/chrome/installer/setup/inst...
chrome/installer/setup/install_unittest.cc:469:
shortcut_path_template.Append(FILE_PATH_LITERAL("shortcut.lnk"));
You can use the fixture's |user_desktop_shortcut_| below instead and get rid of
|shortcut_path_template|.

https://codereview.chromium.org/1803383002/diff/1/chrome/installer/setup/inst...
chrome/installer/setup/install_unittest.cc:471: static const struct TestData {
s/TestData/TestCase/

https://codereview.chromium.org/1803383002/diff/1/chrome/installer/setup/inst...
chrome/installer/setup/install_unittest.cc:526: // Check if shortcuts were
updated correctly.
s/Check if/Verify that/

[fdoray, 2016-03-17 00:50:35]

https://codereview.chromium.org/1803383002/diff/1/chrome/installer/setup/inst...
File chrome/installer/setup/install.h (right):

https://codereview.chromium.org/1803383002/diff/1/chrome/installer/setup/inst...
chrome/installer/setup/install.h:56: // - Whose paths ends with
|old_target_path_suffix|.
On 2016/03/16 21:57:30, gab wrote:
> s/paths/path/

Done.

https://codereview.chromium.org/1803383002/diff/1/chrome/installer/setup/inst...
File chrome/installer/setup/install_unittest.cc (right):

https://codereview.chromium.org/1803383002/diff/1/chrome/installer/setup/inst...
chrome/installer/setup/install_unittest.cc:469:
shortcut_path_template.Append(FILE_PATH_LITERAL("shortcut.lnk"));
On 2016/03/16 21:57:31, gab wrote:
> You can use the fixture's |user_desktop_shortcut_| below instead and get rid
of
> |shortcut_path_template|.

Done.

https://codereview.chromium.org/1803383002/diff/1/chrome/installer/setup/inst...
chrome/installer/setup/install_unittest.cc:471: static const struct TestData {
On 2016/03/16 21:57:30, gab wrote:
> s/TestData/TestCase/

Done.

https://codereview.chromium.org/1803383002/diff/1/chrome/installer/setup/inst...
chrome/installer/setup/install_unittest.cc:526: // Check if shortcuts were
updated correctly.
On 2016/03/16 21:57:31, gab wrote:
> s/Check if/Verify that/

Done.

[fdoray, 2016-03-17 00:50:38]

The CQ bit was checked by fdoray@chromium.org

[fdoray, 2016-03-17 00:50:39]

The patchset sent to the CQ was uploaded after l-g-t-m from gab@chromium.org
Link to the patchset: https://codereview.chromium.org/1803383002/#ps20001
(title: "CR from gab@ #4")

[commit-bot: I haz the power, 2016-03-17 00:51:07]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1803383002/20001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1803383002/20001

[fdoray, 2016-03-17 01:29:45]

The CQ bit was unchecked by fdoray@chromium.org

[fdoray, 2016-03-17 01:30:23]

The CQ bit was checked by fdoray@chromium.org

[fdoray, 2016-03-17 01:30:24]

The patchset sent to the CQ was uploaded after l-g-t-m from gab@chromium.org
Link to the patchset: https://codereview.chromium.org/1803383002/#ps40001
(title: "Normalize file paths.")

[commit-bot: I haz the power, 2016-03-17 01:30:42]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1803383002/40001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1803383002/40001

[commit-bot: I haz the power, 2016-03-17 02:11:21]

Description was changed from

==========
Don't update Canary shortcuts from Dev/Beta/Stable installer.

Before this change, UpdatePerUserShortcutsInLocation() looked for
shortcuts pointing to |install dir|(.*)chrome\.exe and updated them
to point to the chrome.exe of the current installation. Unfortunately,
for a user-level dev/beta/stable installation, |install dir| is
something like "C:\Users\...\Google\Chrome", which means that
"C:\Users\...\Google\Chrome SxS\chrome.exe" is matched.

With this CL, a dev/beta/stable installer will no longer try to update
shortcuts pointing to a Canary installation.

BUG=595374
==========

to

==========
Don't update Canary shortcuts from Dev/Beta/Stable installer.

Before this change, UpdatePerUserShortcutsInLocation() looked for
shortcuts pointing to |install dir|(.*)chrome\.exe and updated them
to point to the chrome.exe of the current installation. Unfortunately,
for a user-level dev/beta/stable installation, |install dir| is
something like "C:\Users\...\Google\Chrome", which means that
"C:\Users\...\Google\Chrome SxS\chrome.exe" is matched.

With this CL, a dev/beta/stable installer will no longer try to update
shortcuts pointing to a Canary installation.

BUG=595374
==========

[commit-bot: I haz the power, 2016-03-17 02:11:22]

Committed patchset #3 (id:40001)

[commit-bot: I haz the power, 2016-03-17 02:12:45]

Description was changed from

==========
Don't update Canary shortcuts from Dev/Beta/Stable installer.

Before this change, UpdatePerUserShortcutsInLocation() looked for
shortcuts pointing to |install dir|(.*)chrome\.exe and updated them
to point to the chrome.exe of the current installation. Unfortunately,
for a user-level dev/beta/stable installation, |install dir| is
something like "C:\Users\...\Google\Chrome", which means that
"C:\Users\...\Google\Chrome SxS\chrome.exe" is matched.

With this CL, a dev/beta/stable installer will no longer try to update
shortcuts pointing to a Canary installation.

BUG=595374
==========

to

==========
Don't update Canary shortcuts from Dev/Beta/Stable installer.

Before this change, UpdatePerUserShortcutsInLocation() looked for
shortcuts pointing to |install dir|(.*)chrome\.exe and updated them
to point to the chrome.exe of the current installation. Unfortunately,
for a user-level dev/beta/stable installation, |install dir| is
something like "C:\Users\...\Google\Chrome", which means that
"C:\Users\...\Google\Chrome SxS\chrome.exe" is matched.

With this CL, a dev/beta/stable installer will no longer try to update
shortcuts pointing to a Canary installation.

BUG=595374

Committed: https://crrev.com/a31042286f1978cfed1546b500db62a96fa9e5c6
Cr-Commit-Position: refs/heads/master@{#381642}
==========

[commit-bot: I haz the power, 2016-03-17 02:12:46]

Patchset 3 (id:??) landed as
https://crrev.com/a31042286f1978cfed1546b500db62a96fa9e5c6
Cr-Commit-Position: refs/heads/master@{#381642}