Merge 114608, 115692 to 963 (M17) branch.

Merge 114608, 115692 to 963 (M17) branch.

[Sync Promo UI] Changing sync promo to honor brand codes.

Also, this CL moves chrome/browser/ui/webui/sync_promo_* to
chrome/browser/ui/webui/sync_promo/sync_promo_*.

BUG=107223
R=stevet@chromium.org,rogerta@chromium.org,sail@chromium.org
TEST=The sync promo responds to brand code and records results of the field
trial correctly.
Review URL: http://codereview.chromium.org/8933003

[Sync Promo UI] Change data reporting to differentiate between startup and other
means of getting to the full page sync promo.

R=stevet@chromium.org,sail@chromium.org
TEST=about:histograms, Ctrl+f "WithBrand"
BUG=107223
Review URL: http://codereview.chromium.org/9007041

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

[SteveT, 2011-12-25 17:43:37]

Merge LGTM - but I just noticed that lint caught a couple errors worth fixing in
a separate nit CL and committing to mainline.

[Dan Beam, 2011-12-25 19:13:04]

On 2011/12/25 17:43:37, SteveT wrote:
> Merge LGTM - but I just noticed that lint caught a couple errors worth fixing
in
> a separate nit CL and committing to mainline.

I noticed that as well. The one about include order is inside an #if/#else so I
think the linter got a little confused and I didn't think a 1 char diff was
worth it, was just gonna fix next time I touch the file.

[Dan Beam, 2011-12-28 02:32:47]

+mirandac for OWNERS check

[Miranda Callahan, 2011-12-28 02:32:50]

On 2011/12/25 19:13:04, Dan Beam wrote:
> On 2011/12/25 17:43:37, SteveT wrote:
> > Merge LGTM - but I just noticed that lint caught a couple errors worth
fixing
> in
> > a separate nit CL and committing to mainline.
> 
> I noticed that as well. The one about include order is inside an #if/#else so
I
> think the linter got a little confused and I didn't think a 1 char diff was
> worth it, was just gonna fix next time I touch the file.

profiles/* LGTM