Revert 217130 "On uninstall, delete shortcuts first, and then re..."

Revert 217130 "On uninstall, delete shortcuts first, and then re..."

[Reason for revert: compile failure on Win Aura (maybe due to merge conflict)]

> On uninstall, delete shortcuts first, and then remove directory only if empty.
> 
> Previously, ShellUtil::RemoveShortcuts() simply wipes out the entire directory if |location| is SHORTCUT_LOCATION_START_MENU or SHORTCUT_LOCATION_APP_SHORTCUTS, for efficiency. But we're now writing code to migrate shortcuts on the self-destruct flow. In this case, wiping out the directory would destroy our results. Therefore the new logic for deletion of these directories are:
> - Use same code to remove Chrome-specific shortcuts (this is what's done for other diretories, e.g., Start Menu).
> - If the directory becomes empty, then remove it; otherwise do nothing.
> 
> The side effect is that if user creates any non-Chrome shortcuts in these directories, then these shortcuts (and the containing directory) will persist after Chrome uninstall. I think this is a pretty normal behavior.
> 
> BUG=235857
> 
> Review URL: https://chromiumcodereview.appspot.com/22870004

TBR=huangs@chromium.org

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=217134

[ncarter (slow), 2013-08-13 00:39:03]

Committed patchset #1 manually as r217134.

[gab, 2013-08-13 18:04:05]

Hmmm.. the win7_aura bot had passed on the original CQ, seems extremely unlikely
that this change would have affected a WinAura build more than a regular Win
build (none of this code is Aura specific)...

[ncarter (slow), 2013-08-13 19:30:21]

There were two changes to this file that went through the CQ at the same
time, and which landed around the same time, but which when applied
resulted in a compilation error.

https://chromiumcodereview.appspot.com/22870004
This patch adds a new call to BatchShortcutAction()
https://chromiumcodereview.appspot.com/22607006
This patch changed the signature of BatchShortcutAction()


On Tue, Aug 13, 2013 at 11:04 AM, <gab@chromium.org> wrote:

> Hmmm.. the win7_aura bot had passed on the original CQ, seems extremely
> unlikely
> that this change would have affected a WinAura build more than a regular
> Win
> build (none of this code is Aura specific)...
>
>
https://codereview.chromium.**org/22983003/<https://codereview.chromium.org/2...
>

[huangs, 2013-08-14 18:12:18]

LGTM. I'll merge the change into a synched checkout and resubmit.