Compile fix for merge of codereview.chromium.org/2299203004

Compile fix for merge of codereview.chromium.org/2299203004

Some code the test was written against had changed a method signature
since the 2840 branch was cut.

TBR=lazyboy@chromium.org

BUG=646663

[asargent_no_longer_on_chrome, 2016-09-14 04:09:56]

Description was changed from

==========
Compile fix for merge of codereview.chromium.org/2299203004

Some code the test was written against had changed a method signature
since the 2840 branch was cut.

BUG=605228
==========

to

==========
Compile fix for merge of codereview.chromium.org/2299203004

Some code the test was written against had changed a method signature
since the 2840 branch was cut.

TBR=lazyboy@chromium.org

BUG=605228
==========

[asargent_no_longer_on_chrome, 2016-09-14 04:10:39]

asargent@chromium.org changed reviewers:
+ lazyboy@chromium.org

[asargent_no_longer_on_chrome, 2016-09-14 04:10:59]

The CQ bit was checked by asargent@chromium.org

[commit-bot: I haz the power, 2016-09-14 04:11:17]

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, 2016-09-14 04:11:19]

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

[commit-bot: I haz the power, 2016-09-14 04:11:20]

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

[asargent_no_longer_on_chrome, 2016-09-14 04:14:30]

Description was changed from

==========
Compile fix for merge of codereview.chromium.org/2299203004

Some code the test was written against had changed a method signature
since the 2840 branch was cut.

TBR=lazyboy@chromium.org

BUG=605228
==========

to

==========
Compile fix for merge of codereview.chromium.org/2299203004

Some code the test was written against had changed a method signature
since the 2840 branch was cut.

TBR=lazyboy@chromium.org

BUG=646663
==========

[asargent_no_longer_on_chrome, 2016-09-14 04:20:35]

I started committing this via 'git cl land' and while that was working realized
I had put the wrong bug number in the description. I've updated the description
here to correctly point to bug 646663 but the bug entry might not get the
automatic notice appended to it by the commit process.