Reland of upload of "Flock master startup."

Reland of upload of "Flock master startup." (patchset #1 id:1 of https://codereview.chromium.org/1883193003/ )

Reason for revert:
dsansome missed https://chromiumcodereview.appspot.com/1884873010/ :(

Original issue's description:
> Revert of Reupload of "Flock master startup." (patchset #2 id:20001 of https://codereview.chromium.org/1892643002/ )
> 
> Reason for revert:
> if [ -n $(ps -p$PID -o pid=) ]; then
> 
> This doesn't work at all.  Check the return code of ps or quote the string.  http://o/293111
> 
> Original issue's description:
> > Reupload of "Flock master startup."
> > 
> > This was reverted because the path manipulation didn't work for internal masters. Original patchset here: https://chromiumcodereview.appspot.com/1883813003/.
> > 
> > BUG=588118
> > 
> > Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=299942
> 
> TBR=pgervais@chromium.org,dnj@chromium.org,stip@chromium.org
> # Skipping CQ checks because original CL landed less than 1 days ago.
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=588118
> 
> Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=299948

TBR=pgervais@chromium.org,dnj@chromium.org,dsansome@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=588118
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=299949

[ghost stip (do not use), 2016-04-15 05:48:29]

Created Reland of upload of "Flock master startup."

[commit-bot: I haz the power, 2016-04-15 05:48:36]

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

[commit-bot: I haz the power, 2016-04-15 05:48:46]

Description was changed from

==========
Reland of upload of "Flock master startup." (patchset #1 id:1 of
https://codereview.chromium.org/1883193003/ )

Reason for revert:
dsansome missed https://chromiumcodereview.appspot.com/1884873010/ :(

Original issue's description:
> Revert of Reupload of "Flock master startup." (patchset #2 id:20001 of
https://codereview.chromium.org/1892643002/ )
> 
> Reason for revert:
> if [ -n $(ps -p$PID -o pid=) ]; then
> 
> This doesn't work at all.  Check the return code of ps or quote the string. 
http://o/293111
> 
> Original issue's description:
> > Reupload of "Flock master startup."
> > 
> > This was reverted because the path manipulation didn't work for internal
masters. Original patchset here:
https://chromiumcodereview.appspot.com/1883813003/.
> > 
> > BUG=588118
> > 
> > Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=299942
> 
> TBR=pgervais@chromium.org,dnj@chromium.org,stip@chromium.org
> # Skipping CQ checks because original CL landed less than 1 days ago.
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=588118
> 
> Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=299948

TBR=pgervais@chromium.org,dnj@chromium.org,dsansome@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=588118
==========

to

==========
Reland of upload of "Flock master startup." (patchset #1 id:1 of
https://codereview.chromium.org/1883193003/ )

Reason for revert:
dsansome missed https://chromiumcodereview.appspot.com/1884873010/ :(

Original issue's description:
> Revert of Reupload of "Flock master startup." (patchset #2 id:20001 of
https://codereview.chromium.org/1892643002/ )
> 
> Reason for revert:
> if [ -n $(ps -p$PID -o pid=) ]; then
> 
> This doesn't work at all.  Check the return code of ps or quote the string. 
http://o/293111
> 
> Original issue's description:
> > Reupload of "Flock master startup."
> > 
> > This was reverted because the path manipulation didn't work for internal
masters. Original patchset here:
https://chromiumcodereview.appspot.com/1883813003/.
> > 
> > BUG=588118
> > 
> > Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=299942
> 
> TBR=pgervais@chromium.org,dnj@chromium.org,stip@chromium.org
> # Skipping CQ checks because original CL landed less than 1 days ago.
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=588118
> 
> Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=299948

TBR=pgervais@chromium.org,dnj@chromium.org,dsansome@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=588118

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=299949
==========

[commit-bot: I haz the power, 2016-04-15 05:48:47]

Committed patchset #1 (id:1) as
http://src.chromium.org/viewvc/chrome?view=rev&revision=299949

[dsansome, 2016-04-15 06:33:54]

lgtm