Fix compile failures from shelf locking merge CL.

Fix compile failures from shelf locking merge CL.

Fixes a compile failure from the M-51 merge CL:
  https://codereview.chromium.org/1907363004

See the failure here:
  https://uberchromegw.corp.google.com/i/official.desktop.continuous/builders/precise64%20beta/builds/2454

BUG=603243
TEST=Fixes go/betabuilders bots.
R=sky@chromium.org
NOTRY=true
NOPRESUBMIT=true

[msw, 2016-04-22 20:33:28]

Hey Scott, heads up; building locally now, will land asap.

[sky, 2016-04-22 20:35:28]

LGTM

[msw, 2016-04-22 20:38:14]

The CQ bit was checked by msw@chromium.org

[commit-bot: I haz the power, 2016-04-22 20:39:05]

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

[commit-bot: I haz the power, 2016-04-22 20:39:07]

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

[commit-bot: I haz the power, 2016-04-22 20:39:08]

CLs for remote refs other than refs/pending/heads/master must contain NOTRY=true
and NOPRESUBMIT=true in order for the CQ to process them

[msw, 2016-04-22 20:40:20]

Description was changed from

==========
Fix compile failures from shelf locking merge CL.

Fixes a compile failure from the M-51 merge CL:
  https://codereview.chromium.org/1907363004

See the failure here:
 
https://uberchromegw.corp.google.com/i/official.desktop.continuous/builders/p...

BUG=603243
TEST=Fixes go/betabuilders bots.
TBR=sky@chromium.org
==========

to

==========
Fix compile failures from shelf locking merge CL.

Fixes a compile failure from the M-51 merge CL:
  https://codereview.chromium.org/1907363004

See the failure here:
 
https://uberchromegw.corp.google.com/i/official.desktop.continuous/builders/p...

BUG=603243
TEST=Fixes go/betabuilders bots.
TBR=sky@chromium.org
NOTRY=true
NOPRESUBMIT=true
==========

[msw, 2016-04-22 20:40:28]

Description was changed from

==========
Fix compile failures from shelf locking merge CL.

Fixes a compile failure from the M-51 merge CL:
  https://codereview.chromium.org/1907363004

See the failure here:
 
https://uberchromegw.corp.google.com/i/official.desktop.continuous/builders/p...

BUG=603243
TEST=Fixes go/betabuilders bots.
TBR=sky@chromium.org
NOTRY=true
NOPRESUBMIT=true
==========

to

==========
Fix compile failures from shelf locking merge CL.

Fixes a compile failure from the M-51 merge CL:
  https://codereview.chromium.org/1907363004

See the failure here:
 
https://uberchromegw.corp.google.com/i/official.desktop.continuous/builders/p...

BUG=603243
TEST=Fixes go/betabuilders bots.
R=sky@chromium.org
NOTRY=true
NOPRESUBMIT=true
==========

[msw, 2016-04-22 20:43:53]

The CQ bit was checked by msw@chromium.org

[msw, 2016-04-22 20:43:53]

The patchset sent to the CQ was uploaded after l-g-t-m from sky@chromium.org
Link to the patchset: https://codereview.chromium.org/1913553002/#ps20001
(title: "Update GetAlignment function call.")

[commit-bot: I haz the power, 2016-04-22 20:44:50]

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

[commit-bot: I haz the power, 2016-04-22 20:46:27]

Description was changed from

==========
Fix compile failures from shelf locking merge CL.

Fixes a compile failure from the M-51 merge CL:
  https://codereview.chromium.org/1907363004

See the failure here:
 
https://uberchromegw.corp.google.com/i/official.desktop.continuous/builders/p...

BUG=603243
TEST=Fixes go/betabuilders bots.
R=sky@chromium.org
NOTRY=true
NOPRESUBMIT=true
==========

to

==========
Fix compile failures from shelf locking merge CL.

Fixes a compile failure from the M-51 merge CL:
  https://codereview.chromium.org/1907363004

See the failure here:
 
https://uberchromegw.corp.google.com/i/official.desktop.continuous/builders/p...

BUG=603243
TEST=Fixes go/betabuilders bots.
R=sky@chromium.org
NOTRY=true
NOPRESUBMIT=true
==========

[commit-bot: I haz the power, 2016-04-22 20:46:28]

Committed patchset #2 (id:20001)