Partially merge r177090 for crbug.com/169131.

Partially merge r177090 for crbug.com/169131.

BUG=169131
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=177511

[Ryan Sleevi, 2013-01-16 23:02:47]

The NSS changes look fine, but I'm generally uncomfortable with post-branch rev
bumps. I leave that for Kerz if there are ideological reasons not to. It should
be fine though.

https://codereview.chromium.org/11946026/diff/1/DEPS
File DEPS (right):

https://codereview.chromium.org/11946026/diff/1/DEPS#newcode42
DEPS:42: "nss_revision": "176741",
In the future, please make sure to document what changes are in this range or to
provide a quick link.

http://build.chromium.org/f/chromium/perf/dashboard/ui/changelog.html?url=/tr...

So the only *other* changes beyond the WebRTC ones are compile-tweaks to the GYP
file for Win64, so this change SHOULD be safe.

[Ryan Sleevi, 2013-01-16 23:04:09]

https://codereview.chromium.org/11946026/diff/1/third_party/libjingle/libjing...
File third_party/libjingle/libjingle.gyp (right):

https://codereview.chromium.org/11946026/diff/1/third_party/libjingle/libjing...
third_party/libjingle/libjingle.gyp:157: 'OS != "android"', {
FWIW, this is not officially supported GYP syntax, and may break at any time. I
think maruel has it on the roadmap to break this. Single line all the way.

[Ronghua Wu (Left Chromium), 2013-01-17 00:36:48]

https://codereview.chromium.org/11946026/diff/1/DEPS
File DEPS (right):

https://codereview.chromium.org/11946026/diff/1/DEPS#newcode42
DEPS:42: "nss_revision": "176741",
On 2013/01/16 23:02:48, Ryan Sleevi wrote:
> In the future, please make sure to document what changes are in this range or
to
> provide a quick link.
> 
>
http://build.chromium.org/f/chromium/perf/dashboard/ui/changelog.html?url=/tr...
> 
> So the only *other* changes beyond the WebRTC ones are compile-tweaks to the
GYP
> file for Win64, so this change SHOULD be safe.

Thanks for the link.

https://codereview.chromium.org/11946026/diff/1/third_party/libjingle/libjing...
File third_party/libjingle/libjingle.gyp (right):

https://codereview.chromium.org/11946026/diff/1/third_party/libjingle/libjing...
third_party/libjingle/libjingle.gyp:157: 'OS != "android"', {
On 2013/01/16 23:04:09, Ryan Sleevi wrote:
> FWIW, this is not officially supported GYP syntax, and may break at any time.
I
> think maruel has it on the roadmap to break this. Single line all the way.

Done. Will make the same change in trunk.

[kerz_google, 2013-01-17 00:57:23]

This will not work.  You need to look at the DEPS in
chrome-internal/trunk/tools/buildspec/branches/1364 and update that file. 
Please do the diff from the rev listed there to the one you'd like to move to. 
Generally we recommend a branch for these sort of moves.

[Ronghua Wu (Left Chromium), 2013-01-17 01:11:51]

On 2013/01/17 00:57:23, kerz_google wrote:
> This will not work.  You need to look at the DEPS in
> chrome-internal/trunk/tools/buildspec/branches/1364 and update that file. 
> Please do the diff from the rev listed there to the one you'd like to move to.

> Generally we recommend a branch for these sort of moves.

I see, will do the DEPS change there. But libjingle.gyp has to be done here.
Correct?

[kerz_google, 2013-01-17 01:19:59]

On 2013/01/17 01:11:51, Ronghua Wu wrote:
> On 2013/01/17 00:57:23, kerz_google wrote:
> > This will not work.  You need to look at the DEPS in
> > chrome-internal/trunk/tools/buildspec/branches/1364 and update that file. 
> > Please do the diff from the rev listed there to the one you'd like to move
to.
> 
> > Generally we recommend a branch for these sort of moves.
> 
> I see, will do the DEPS change there. But libjingle.gyp has to be done here.
> Correct?

I guess so.  It would be better to create a branch at the revision specified in
the branch DEPS, then apply only the changes you need on that branch.  If this
is the only change since that revision, bumping is fine.

[wtc, 2013-01-17 02:42:23]

https://codereview.chromium.org/11946026/diff/1/DEPS
File DEPS (right):

https://codereview.chromium.org/11946026/diff/1/DEPS#newcode42
DEPS:42: "nss_revision": "176741",

I looked at the changes in NSS in the revision range 172945:176741.
I concur all of them are suitable for merging to the Chrome 25
branch.

[Ronghua Wu (Left Chromium), 2013-01-17 16:35:29]

Hi Jason, may I get your approval for this cl?

[juberti, 2013-01-17 17:08:14]

On 2013/01/17 16:35:29, Ronghua Wu wrote:
> Hi Jason, may I get your approval for this cl?

lgtm

[Ronghua Wu (Left Chromium), 2013-01-17 21:48:49]

ping Jason

[kerz_google, 2013-01-17 22:00:20]

lgtm