[Contextual Search] Implements Opt-out promo.

[Contextual Search] Implements Opt-out promo.

BUG=473807
Committed: https://crrev.com/e76fd1767f3bf81a2e2231ec196c22571d5c3734
Cr-Commit-Position: refs/heads/master@{#323825}

[pedro (no code reviews), 2015-04-01 23:58:59]

pedrosimonetti@chromium.org changed reviewers:
+ donnd@chromium.org

[pedro (no code reviews), 2015-04-02 10:28:43]

pedrosimonetti@chromium.org changed reviewers:
+ dtrainor@chromium.org

[pedro (no code reviews), 2015-04-02 10:28:57]

Hey David, please take a first look at this change. It is not complete yet, but
it is in a decent shape.

[Donn Denman, 2015-04-02 19:43:27]

On 2015/04/02 10:28:57, pedrosimonetti wrote:
> Hey David, please take a first look at this change. It is not complete yet,
but
> it is in a decent shape.

Nice work Pedro!

I'm sure David will have comments on the nitty-gritty, but this sure looks like
you're getting close to me.

[Donn Denman, 2015-04-02 19:45:00]

Here's my comments.

https://codereview.chromium.org/1050163004/diff/20001/chrome/android/java/res...
File chrome/android/java/res/layout/contextual_search_opt_out_promo.xml (right):

https://codereview.chromium.org/1050163004/diff/20001/chrome/android/java/res...
chrome/android/java/res/layout/contextual_search_opt_out_promo.xml:33: <Button
As you know, we'll want to add a second button.

https://codereview.chromium.org/1050163004/diff/20001/chrome/android/java/src...
File
chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanelBase.java
(right):

https://codereview.chromium.org/1050163004/diff/20001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanelBase.java:185:
private Context mContext;
Looks like you can make this final.

https://codereview.chromium.org/1050163004/diff/20001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanelBase.java:597:
return Math.round((getOffsetY() + getSearchBarHeight()) / mPxToDp);
Since you're returning a float, maybe you don't need to round?

https://codereview.chromium.org/1050163004/diff/20001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanelBase.java:746:
if (height != getPanelHeightFromState(PanelState.MAXIMIZED)) {
Shouldn't this be EXPANDED, since the promo only shows in expanded size?

https://codereview.chromium.org/1050163004/diff/20001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanelBase.java:1166:
// ContextualSearchControl
Nit: I would remove this divider and just merge these two sections since they
both use the same members.  Another option would be to just move the mControl
up.  Totally up to you!

https://codereview.chromium.org/1050163004/diff/20001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanelBase.java:1171:
private ContextualSearchControl mControl;
... and move this up.

https://codereview.chromium.org/1050163004/diff/20001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanelBase.java:1174:
* Inflates the Contextual Search control, if needed.
Add comment that it sets/leaves the control invisible?

https://codereview.chromium.org/1050163004/diff/20001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanelBase.java:1232:
mSearchPromo.getParent().requestLayout();
Do we still need this, given we'll do the same in the runnable?

https://codereview.chromium.org/1050163004/diff/20001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanelBase.java:1233:
new Handler().post(new Runnable() {
Add a comment why this needs to be done in a runnable?

https://codereview.chromium.org/1050163004/diff/20001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanelBase.java:1250:
private ContextualSearchOptOutPromo mSearchPromo;
nit: add a blank line after.

https://codereview.chromium.org/1050163004/diff/20001/chrome/android/java/src...
File
chrome/android/java/src/org/chromium/chrome/browser/widget/ContextualSearchControl.java
(right):

https://codereview.chromium.org/1050163004/diff/20001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/widget/ContextualSearchControl.java:23:
public class ContextualSearchControl extends LinearLayout {
I didn't really review this, since it's just being moved from downstream, right?

https://codereview.chromium.org/1050163004/diff/20001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/widget/ContextualSearchControl.java:90:
//        String firstRunText =
ContextualSearchFieldTrial.getEnglishExperimentFirstRunText(
You can remove this, it's not being used.

You should also remove the definition in ContextualSearchFieldTrial.

[Donn Denman, 2015-04-02 20:02:28]

https://codereview.chromium.org/1050163004/diff/20001/chrome/android/java/src...
File
chrome/android/java/src/org/chromium/chrome/browser/widget/ContextualSearchControl.java
(right):

https://codereview.chromium.org/1050163004/diff/20001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/widget/ContextualSearchControl.java:90:
//        String firstRunText =
ContextualSearchFieldTrial.getEnglishExperimentFirstRunText(
On 2015/04/02 19:45:00, Donn Denman wrote:
> You should also remove the definition in ContextualSearchFieldTrial.
Actually, I'll remove this definition in my CL.

[David Trainor- moved to gerrit, 2015-04-02 20:38:24]

mainly nits.  the only main concern I have is making sure the promo is removed
from the view hierarchy when the panel is gone even if the promo will have to be
shown again next time.  you don't have to necessarily destroy until you're sure
you won't show it again though.  lgtm.

https://chromiumcodereview.appspot.com/1050163004/diff/20001/chrome/android/j...
File
chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanelBase.java
(right):

https://chromiumcodereview.appspot.com/1050163004/diff/20001/chrome/android/j...
chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanelBase.java:746:
if (height != getPanelHeightFromState(PanelState.MAXIMIZED)) {
Can you explain this a bit?  Maybe I'm mixing up panel states.  I figured this
would be when we want to show it.

https://chromiumcodereview.appspot.com/1050163004/diff/20001/chrome/android/j...
chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanelBase.java:1052:
// TODO(pedrosimonetti): DO NOT SUBMIT! Only update Promo when enabled. We need
Ahhh!  Just reminding you about these comments :).

https://chromiumcodereview.appspot.com/1050163004/diff/20001/chrome/android/j...
chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanelBase.java:1154:
// TODO(pedrosimonetti): DO NOT SUBMIT! Move this to the right place.
This looks okay to me.  Should this move?

https://chromiumcodereview.appspot.com/1050163004/diff/20001/chrome/android/j...
chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanelBase.java:1161:
public void setContainerView(ViewGroup container) {
Javadoc

https://chromiumcodereview.appspot.com/1050163004/diff/20001/chrome/android/j...
chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanelBase.java:1220:
if (mSearchPromo.getLayoutParams() instanceof MarginLayoutParams) {
You don't need this instanceof check if you're the one setting the layout params
in this file in the first place.  If the layout params ever aren't a
MarginLayoutParams instance the UX will fail right?

https://chromiumcodereview.appspot.com/1050163004/diff/20001/chrome/android/j...
chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanelBase.java:1225:
mSearchPromo.getParent().requestLayout();
Why requestLayout/why getParent?  Same below?

https://chromiumcodereview.appspot.com/1050163004/diff/20001/chrome/android/j...
chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanelBase.java:1304:
// TODO(pedrosimonetti): DO NOT SUBMIT! call this!
?

https://chromiumcodereview.appspot.com/1050163004/diff/20001/chrome/android/j...
chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanelBase.java:1308:
mSearchPromo = null;
Does the promo go away if I dismiss/reload the contextual search bar without
pressing anything?  We should probably leave mSearchPromo inflated but we should
still remove it from the view hierarchy when the contextual search bar hides.

https://chromiumcodereview.appspot.com/1050163004/diff/20001/chrome/android/j...
File
chrome/android/java/src/org/chromium/chrome/browser/widget/ContextualSearchControl.java
(right):

https://chromiumcodereview.appspot.com/1050163004/diff/20001/chrome/android/j...
chrome/android/java/src/org/chromium/chrome/browser/widget/ContextualSearchControl.java:1:
// Copyright 2014 The Chromium Authors. All rights reserved.
2015, here and everywhere else

https://chromiumcodereview.appspot.com/1050163004/diff/20001/chrome/android/j...
chrome/android/java/src/org/chromium/chrome/browser/widget/ContextualSearchControl.java:5:
package org.chromium.chrome.browser.widget;
Can you put this in either browser.compositor.bottombar.contextualsearch or
browser.contextualsearch?  It depends on who owns it (I'll leave it up to you). 
I think we're trying to make browser.widget used for more generic widgets.

https://chromiumcodereview.appspot.com/1050163004/diff/20001/chrome/android/j...
File
chrome/android/java/src/org/chromium/chrome/browser/widget/ContextualSearchOptOutPromo.java
(right):

https://chromiumcodereview.appspot.com/1050163004/diff/20001/chrome/android/j...
chrome/android/java/src/org/chromium/chrome/browser/widget/ContextualSearchOptOutPromo.java:1:
// Copyright 2014 The Chromium Authors. All rights reserved.
2015

https://chromiumcodereview.appspot.com/1050163004/diff/20001/chrome/android/j...
chrome/android/java/src/org/chromium/chrome/browser/widget/ContextualSearchOptOutPromo.java:17:
public class ContextualSearchOptOutPromo extends LinearLayout {
Do you need to implement invalidateChildInParent?

https://chromiumcodereview.appspot.com/1050163004/diff/20001/chrome/browser/a...
File chrome/browser/android/compositor/layer/contextual_search_layer.cc (right):

https://chromiumcodereview.appspot.com/1050163004/diff/20001/chrome/browser/a...
chrome/browser/android/compositor/layer/contextual_search_layer.cc:175: if
(search_promo_.get() && search_promo_->parent())
Don't need these if checks right?

https://chromiumcodereview.appspot.com/1050163004/diff/20001/chrome/browser/a...
chrome/browser/android/compositor/layer/contextual_search_layer.cc:176:
search_promo_->RemoveFromParent();
Do we need this call?

[pedro (no code reviews), 2015-04-03 21:01:02]

Please take another look.

https://codereview.chromium.org/1050163004/diff/20001/chrome/android/java/res...
File chrome/android/java/res/layout/contextual_search_opt_out_promo.xml (right):

https://codereview.chromium.org/1050163004/diff/20001/chrome/android/java/res...
chrome/android/java/res/layout/contextual_search_opt_out_promo.xml:33: <Button
On 2015/04/02 19:44:58, Donn Denman wrote:
> As you know, we'll want to add a second button.

Acknowledged.

https://codereview.chromium.org/1050163004/diff/20001/chrome/android/java/src...
File
chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanelBase.java
(right):

https://codereview.chromium.org/1050163004/diff/20001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanelBase.java:185:
private Context mContext;
On 2015/04/02 19:45:00, Donn Denman wrote:
> Looks like you can make this final.

Done.

https://codereview.chromium.org/1050163004/diff/20001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanelBase.java:597:
return Math.round((getOffsetY() + getSearchBarHeight()) / mPxToDp);
On 2015/04/02 19:45:00, Donn Denman wrote:
> Since you're returning a float, maybe you don't need to round?

We need to round it because it represents pixel values, otherwise those pixel
gaps might appear.

https://codereview.chromium.org/1050163004/diff/20001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanelBase.java:746:
if (height != getPanelHeightFromState(PanelState.MAXIMIZED)) {
On 2015/04/02 19:45:00, Donn Denman wrote:
> Shouldn't this be EXPANDED, since the promo only shows in expanded size?

You're right. It should be EXPANDED. Thanks for catching this!

https://codereview.chromium.org/1050163004/diff/20001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanelBase.java:746:
if (height != getPanelHeightFromState(PanelState.MAXIMIZED)) {
On 2015/04/02 20:38:23, David Trainor wrote:
> Can you explain this a bit?  Maybe I'm mixing up panel states.  I figured this
> would be when we want to show it.

Added comments explaining what is going on.

https://codereview.chromium.org/1050163004/diff/20001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanelBase.java:1052:
// TODO(pedrosimonetti): DO NOT SUBMIT! Only update Promo when enabled. We need
On 2015/04/02 20:38:23, David Trainor wrote:
> Ahhh!  Just reminding you about these comments :).

Done.

https://codereview.chromium.org/1050163004/diff/20001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanelBase.java:1154:
// TODO(pedrosimonetti): DO NOT SUBMIT! Move this to the right place.
On 2015/04/02 20:38:23, David Trainor wrote:
> This looks okay to me.  Should this move?

Yes, this is in the right place now. I forgot to remove the comment. Removing it
now.

https://codereview.chromium.org/1050163004/diff/20001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanelBase.java:1161:
public void setContainerView(ViewGroup container) {
On 2015/04/02 20:38:23, David Trainor wrote:
> Javadoc

Done.

https://codereview.chromium.org/1050163004/diff/20001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanelBase.java:1166:
// ContextualSearchControl
On 2015/04/02 19:44:58, Donn Denman wrote:
> Nit: I would remove this divider and just merge these two sections since they
> both use the same members.  Another option would be to just move the mControl
> up.  Totally up to you!

Done.

https://codereview.chromium.org/1050163004/diff/20001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanelBase.java:1171:
private ContextualSearchControl mControl;
On 2015/04/02 19:44:59, Donn Denman wrote:
> ... and move this up.

Done.

https://codereview.chromium.org/1050163004/diff/20001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanelBase.java:1174:
* Inflates the Contextual Search control, if needed.
On 2015/04/02 19:44:58, Donn Denman wrote:
> Add comment that it sets/leaves the control invisible?

Done.

https://codereview.chromium.org/1050163004/diff/20001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanelBase.java:1220:
if (mSearchPromo.getLayoutParams() instanceof MarginLayoutParams) {
On 2015/04/02 20:38:24, David Trainor wrote:
> You don't need this instanceof check if you're the one setting the layout
params
> in this file in the first place.  If the layout params ever aren't a
> MarginLayoutParams instance the UX will fail right?

Right. As you suggested, I'm using setTranslationY() now.

https://codereview.chromium.org/1050163004/diff/20001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanelBase.java:1225:
mSearchPromo.getParent().requestLayout();
On 2015/04/02 20:38:23, David Trainor wrote:
> Why requestLayout/why getParent?  Same below?

We need to call requestLayout, otherwise the Promo View will not become visible.
We don't need to call it in the parent though. Calling it in the element itself
does the trick.

https://codereview.chromium.org/1050163004/diff/20001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanelBase.java:1232:
mSearchPromo.getParent().requestLayout();
On 2015/04/02 19:45:00, Donn Denman wrote:
> Do we still need this, given we'll do the same in the runnable?

This is not necessary anymore.

https://codereview.chromium.org/1050163004/diff/20001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanelBase.java:1233:
new Handler().post(new Runnable() {
On 2015/04/02 19:44:59, Donn Denman wrote:
> Add a comment why this needs to be done in a runnable?

Thanks for pointing this out. The Runnable is not necessary anymore. There used
to be a race condition, but now it's fixed.

https://codereview.chromium.org/1050163004/diff/20001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanelBase.java:1250:
private ContextualSearchOptOutPromo mSearchPromo;
On 2015/04/02 19:44:59, Donn Denman wrote:
> nit: add a blank line after.

Done.

https://codereview.chromium.org/1050163004/diff/20001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanelBase.java:1304:
// TODO(pedrosimonetti): DO NOT SUBMIT! call this!
On 2015/04/02 20:38:23, David Trainor wrote:
> ?

This is being properly called now.

https://codereview.chromium.org/1050163004/diff/20001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanelBase.java:1308:
mSearchPromo = null;
On 2015/04/02 20:38:23, David Trainor wrote:
> Does the promo go away if I dismiss/reload the contextual search bar without
> pressing anything?  We should probably leave mSearchPromo inflated but we
should
> still remove it from the view hierarchy when the contextual search bar hides.

For now, I'm destroying the View whenever the Panel closes. If the user didn't
press any Promo button, it'll be inflated and added to the hierarchy again.

https://codereview.chromium.org/1050163004/diff/20001/chrome/android/java/src...
File
chrome/android/java/src/org/chromium/chrome/browser/widget/ContextualSearchControl.java
(right):

https://codereview.chromium.org/1050163004/diff/20001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/widget/ContextualSearchControl.java:1:
// Copyright 2014 The Chromium Authors. All rights reserved.
On 2015/04/02 20:38:24, David Trainor wrote:
> 2015, here and everywhere else

Done.

https://codereview.chromium.org/1050163004/diff/20001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/widget/ContextualSearchControl.java:5:
package org.chromium.chrome.browser.widget;
On 2015/04/02 20:38:24, David Trainor wrote:
> Can you put this in either browser.compositor.bottombar.contextualsearch or
> browser.contextualsearch?  It depends on who owns it (I'll leave it up to
you). 
> I think we're trying to make browser.widget used for more generic widgets.

Done.

https://codereview.chromium.org/1050163004/diff/20001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/widget/ContextualSearchControl.java:23:
public class ContextualSearchControl extends LinearLayout {
On 2015/04/02 19:45:00, Donn Denman wrote:
> I didn't really review this, since it's just being moved from downstream,
right?

Yes, this is just being moved.

https://codereview.chromium.org/1050163004/diff/20001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/widget/ContextualSearchControl.java:90:
//        String firstRunText =
ContextualSearchFieldTrial.getEnglishExperimentFirstRunText(
On 2015/04/02 19:45:00, Donn Denman wrote:
> You can remove this, it's not being used.
> 
> You should also remove the definition in ContextualSearchFieldTrial.

Acknowledged.

https://codereview.chromium.org/1050163004/diff/20001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/widget/ContextualSearchControl.java:90:
//        String firstRunText =
ContextualSearchFieldTrial.getEnglishExperimentFirstRunText(
On 2015/04/02 20:02:28, Donn Denman wrote:
> On 2015/04/02 19:45:00, Donn Denman wrote:
> > You should also remove the definition in ContextualSearchFieldTrial.
> Actually, I'll remove this definition in my CL.

Acknowledged.

https://codereview.chromium.org/1050163004/diff/20001/chrome/android/java/src...
File
chrome/android/java/src/org/chromium/chrome/browser/widget/ContextualSearchOptOutPromo.java
(right):

https://codereview.chromium.org/1050163004/diff/20001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/widget/ContextualSearchOptOutPromo.java:1:
// Copyright 2014 The Chromium Authors. All rights reserved.
On 2015/04/02 20:38:24, David Trainor wrote:
> 2015

Done.

https://codereview.chromium.org/1050163004/diff/20001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/widget/ContextualSearchOptOutPromo.java:17:
public class ContextualSearchOptOutPromo extends LinearLayout {
On 2015/04/02 20:38:24, David Trainor wrote:
> Do you need to implement invalidateChildInParent?

It's working without it, so I guess we don't need it. The Promo never changes,
so I suppose this is why we don't need it.

https://codereview.chromium.org/1050163004/diff/20001/chrome/browser/android/...
File chrome/browser/android/compositor/layer/contextual_search_layer.cc (right):

https://codereview.chromium.org/1050163004/diff/20001/chrome/browser/android/...
chrome/browser/android/compositor/layer/contextual_search_layer.cc:175: if
(search_promo_.get() && search_promo_->parent())
On 2015/04/02 20:38:24, David Trainor wrote:
> Don't need these if checks right?

Acknowledged.

https://codereview.chromium.org/1050163004/diff/20001/chrome/browser/android/...
chrome/browser/android/compositor/layer/contextual_search_layer.cc:176:
search_promo_->RemoveFromParent();
On 2015/04/02 20:38:24, David Trainor wrote:
> Do we need this call?

Are you saying that removing the parent is enough? I presume so, so I'm removing
the previous call.

[pedro (no code reviews), 2015-04-03 21:20:59]

The CQ bit was checked by pedrosimonetti@chromium.org

[pedro (no code reviews), 2015-04-03 21:20:59]

The patchset sent to the CQ was uploaded after l-g-t-m from
dtrainor@chromium.org
Link to the patchset: https://codereview.chromium.org/1050163004/#ps60001
(title: "Sync and rebase")

[commit-bot: I haz the power, 2015-04-03 21:21:58]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1050163004/60001

[commit-bot: I haz the power, 2015-04-03 21:47:04]

Committed patchset #4 (id:60001)

[commit-bot: I haz the power, 2015-04-03 21:47:53]

Patchset 4 (id:??) landed as
https://crrev.com/e76fd1767f3bf81a2e2231ec196c22571d5c3734
Cr-Commit-Position: refs/heads/master@{#323825}