Merge ChromeShortcutManager into ShortcutHelper.

Merge ChromeShortcutManager into ShortcutHelper.
ChromeShortcutManager was created for pre-O/O separate compilation.
After upstreaming of ChromeShortcutManagerInternal
(crrev.com/2845803003 and https://chrome-internal-review.googlesource.com/c/367589)
, the content in this class could be merged into ShortcutHelper
to make the code cleaner and less confusing.

BUG=708360
Review-Url: https://codereview.chromium.org/2872473002
Cr-Commit-Position: refs/heads/master@{#470773}
Committed: https://chromium.googlesource.com/chromium/src/+/5b2fff30d156d502cde5f0e9ea52cdda9071375f

[Marti Wong, 2017-05-08 04:40:46]

Description was changed from

==========
Merge ChromeShortcutManager into ShortcutHelper.
ChromeShortcutManager was created for pre-O/O separate compilation,
this class is no longer needed after upstreaming of
ChromeShortcutManagerInternal. (crrev.com/2845803003 and
https://chrome-internal-review.googlesource.com/c/367589)

BUG=708360
==========

to

==========
Merge ChromeShortcutManager into ShortcutHelper.
ChromeShortcutManager was created for pre-O/O separate compilation.
After upstreaming of ChromeShortcutManagerInternal
(crrev.com/2845803003 and
https://chrome-internal-review.googlesource.com/c/367589)
, the content in this class could be merged into ShortcutHelper
to make the code cleaner and less confusing.

BUG=708360
==========

[Marti Wong, 2017-05-08 04:44:16]

martiw@chromium.org changed reviewers:
+ dfalcantara@chromium.org, dominickn@chromium.org

[Marti Wong, 2017-05-08 04:44:17]

PTAL thanks~!

[dominickn, 2017-05-08 04:51:22]

lgtm, thanks so much for this Marti! It's good to have all of this code come
back together :)

https://codereview.chromium.org/2872473002/diff/1/chrome/android/java/src/org...
File chrome/android/java/src/org/chromium/chrome/browser/ShortcutHelper.java
(right):

https://codereview.chromium.org/2872473002/diff/1/chrome/android/java/src/org...
chrome/android/java/src/org/chromium/chrome/browser/ShortcutHelper.java:100: //
have to update this string.
Nit: I think we can remove this comment now since I don't think the name of this
broadcast will ever change (it's been killed!)

[Marti Wong, 2017-05-08 04:52:33]

The CQ bit was checked by martiw@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-05-08 04:53:03]

Dry run: CQ is trying da patch.

Follow status at:
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-05-08 06:36:06]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-05-08 06:36:07]

Dry run: Try jobs failed on following builders:
  linux_chromium_rel_ng on master.tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)

[gone, 2017-05-08 17:20:25]

lgtm

[Marti Wong, 2017-05-09 04:36:42]

Thanks for the help~!
commiting.

https://codereview.chromium.org/2872473002/diff/1/chrome/android/java/src/org...
File chrome/android/java/src/org/chromium/chrome/browser/ShortcutHelper.java
(right):

https://codereview.chromium.org/2872473002/diff/1/chrome/android/java/src/org...
chrome/android/java/src/org/chromium/chrome/browser/ShortcutHelper.java:100: //
have to update this string.
On 2017/05/08 04:51:22, dominickn wrote:
> Nit: I think we can remove this comment now since I don't think the name of
this
> broadcast will ever change (it's been killed!)

Done.

[Marti Wong, 2017-05-09 04:36:46]

The CQ bit was checked by martiw@chromium.org

[Marti Wong, 2017-05-09 04:36:47]

The patchset sent to the CQ was uploaded after l-g-t-m from
dominickn@chromium.org, dfalcantara@chromium.org
Link to the patchset: https://codereview.chromium.org/2872473002/#ps20001
(title: "fix")

[commit-bot: I haz the power, 2017-05-09 04:38:02]

CQ is trying da patch.

Follow status at:
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-05-09 06:34:42]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-05-09 06:34:43]

Try jobs failed on following builders:
  win_chromium_x64_rel_ng on master.tryserver.chromium.win (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.win/builders/win_chromium_x64_...)

[Marti Wong, 2017-05-09 23:28:38]

The CQ bit was checked by martiw@chromium.org

[commit-bot: I haz the power, 2017-05-09 23:30:28]

CQ is trying da patch.

Follow status at:
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-05-10 01:34:53]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-05-10 01:34:54]

Try jobs failed on following builders:
  chromium_presubmit on master.tryserver.chromium.linux (JOB_TIMED_OUT, build
has not started yet; builder either lacks capacity or does not exist
(misspelled?))

[Marti Wong, 2017-05-10 01:53:20]

The CQ bit was checked by martiw@chromium.org

[commit-bot: I haz the power, 2017-05-10 01:55:00]

CQ is trying da patch.

Follow status at:
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-05-10 03:57:33]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-05-10 03:57:38]

Try jobs failed on following builders:
  chromium_presubmit on master.tryserver.chromium.linux (JOB_TIMED_OUT, build
has not started yet; builder either lacks capacity or does not exist
(misspelled?))

[Marti Wong, 2017-05-10 07:34:17]

The CQ bit was checked by martiw@chromium.org

[commit-bot: I haz the power, 2017-05-10 07:34:45]

CQ is trying da patch.

Follow status at:
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-05-10 09:04:45]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-05-10 09:04:46]

Try jobs failed on following builders:
  win_chromium_rel_ng on master.tryserver.chromium.win (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.win/builders/win_chromium_rel_...)

[Marti Wong, 2017-05-11 00:57:56]

The CQ bit was checked by martiw@chromium.org

[commit-bot: I haz the power, 2017-05-11 00:59:22]

CQ is trying da patch.

Follow status at:
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-05-11 02:09:39]

CQ is committing da patch.

Bot data: {"patchset_id": 20001, "attempt_start_ts": 1494464276638630,
"parent_rev": "1aa98d7cf548e42ef1a75828caa6d6831445172b", "commit_rev":
"5b2fff30d156d502cde5f0e9ea52cdda9071375f"}

[commit-bot: I haz the power, 2017-05-11 02:09:52]

Description was changed from

==========
Merge ChromeShortcutManager into ShortcutHelper.
ChromeShortcutManager was created for pre-O/O separate compilation.
After upstreaming of ChromeShortcutManagerInternal
(crrev.com/2845803003 and
https://chrome-internal-review.googlesource.com/c/367589)
, the content in this class could be merged into ShortcutHelper
to make the code cleaner and less confusing.

BUG=708360
==========

to

==========
Merge ChromeShortcutManager into ShortcutHelper.
ChromeShortcutManager was created for pre-O/O separate compilation.
After upstreaming of ChromeShortcutManagerInternal
(crrev.com/2845803003 and
https://chrome-internal-review.googlesource.com/c/367589)
, the content in this class could be merged into ShortcutHelper
to make the code cleaner and less confusing.

BUG=708360

Review-Url: https://codereview.chromium.org/2872473002
Cr-Commit-Position: refs/heads/master@{#470773}
Committed:
https://chromium.googlesource.com/chromium/src/+/5b2fff30d156d502cde5f0e9ea52...
==========

[commit-bot: I haz the power, 2017-05-11 02:09:56]

Committed patchset #2 (id:20001) as
https://chromium.googlesource.com/chromium/src/+/5b2fff30d156d502cde5f0e9ea52...