[Merge M48] Remove support for chrome_shortcut_icon_index master_pref.

[Merge M48] Remove support for chrome_shortcut_icon_index master_pref.

Old icons were removed in M47 and there is thus no reason to support
using an alternate icon index anymore.

BUG=570366
Review URL: https://codereview.chromium.org/1543853002

Cr-Commit-Position: refs/heads/master@{#368086}
(cherry picked from commit 0e35f1c49a0f195c0579e5a2867ce01d0f78393e)

Conflicts:
	chrome/installer/util/master_preferences.h
	chrome/installer/util/master_preferences_unittest.cc

TBR=mgiuca@chromium.org, grt@chromium.org

Committed: https://chromium.googlesource.com/chromium/src/+/33cbe8cd1085e155ab08aa68e55e78a602cd625f

[gab, 2016-01-11 15:21:43]

Description was changed from

==========
[Merge M48] Remove support for chrome_shortcut_icon_index master_pref.

Old icons were removed in M47 and there is thus no reason to support
using an alternate icon index anymore.

BUG=570366

Review URL: https://codereview.chromium.org/1543853002

Cr-Commit-Position: refs/heads/master@{#368086}
(cherry picked from commit 0e35f1c49a0f195c0579e5a2867ce01d0f78393e)

Conflicts:
	chrome/installer/util/master_preferences.h
	chrome/installer/util/master_preferences_unittest.cc
==========

to

==========
[Merge M48] Remove support for chrome_shortcut_icon_index master_pref.

Old icons were removed in M47 and there is thus no reason to support
using an alternate icon index anymore.

BUG=570366

Review URL: https://codereview.chromium.org/1543853002

Cr-Commit-Position: refs/heads/master@{#368086}
(cherry picked from commit 0e35f1c49a0f195c0579e5a2867ce01d0f78393e)

Conflicts:
	chrome/installer/util/master_preferences.h
	chrome/installer/util/master_preferences_unittest.cc

TBR=mgiuca@chromium.org, grt@chromium.org
==========

[gab, 2016-01-11 15:21:43]

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

[gab, 2016-01-11 15:22:14]

FYI/TBR mgiuca/grt: merging this to M48.

[gab, 2016-01-11 15:37:36]

Description was changed from

==========
[Merge M48] Remove support for chrome_shortcut_icon_index master_pref.

Old icons were removed in M47 and there is thus no reason to support
using an alternate icon index anymore.

BUG=570366

Review URL: https://codereview.chromium.org/1543853002

Cr-Commit-Position: refs/heads/master@{#368086}
(cherry picked from commit 0e35f1c49a0f195c0579e5a2867ce01d0f78393e)

Conflicts:
	chrome/installer/util/master_preferences.h
	chrome/installer/util/master_preferences_unittest.cc

TBR=mgiuca@chromium.org, grt@chromium.org
==========

to

==========
[Merge M48] Remove support for chrome_shortcut_icon_index master_pref.

Old icons were removed in M47 and there is thus no reason to support
using an alternate icon index anymore.

BUG=570366

Review URL: https://codereview.chromium.org/1543853002

Cr-Commit-Position: refs/heads/master@{#368086}
(cherry picked from commit 0e35f1c49a0f195c0579e5a2867ce01d0f78393e)

Conflicts:
	chrome/installer/util/master_preferences.h
	chrome/installer/util/master_preferences_unittest.cc

TBR=mgiuca@chromium.org, grt@chromium.org

Committed:
https://chromium.googlesource.com/chromium/src/+/33cbe8cd1085e155ab08aa68e55e...
==========

[gab, 2016-01-11 15:37:37]

Committed patchset #1 (id:1) manually as
33cbe8cd1085e155ab08aa68e55e78a602cd625f (presubmit successful).