NaCl: Reinstate the "nacl_revision" field in DEPS

NaCl: Reinstate the "nacl_revision" field in DEPS

This makes it easier for automated tools such as nacl_deps_bump.py to
update the field.  It also makes it easier to search the history for
changes to the field.

The field was removed by fd5ba194dd83bace0a3623de2fae3fa7d2e5c6c8,
which switched DEPS from SVN revisions to Git revisions.

BUG=263848
TEST=trybots

Committing with
NOTRY=true
due to race with updates to adjacent webkit_revision.

Committed: https://crrev.com/851e1bd141cd5a07241a7e7f7c4707ad4400fe10
Cr-Commit-Position: refs/heads/master@{#293462}

[Mark Seaborn, 2014-09-04 19:19:19]

mseaborn@chromium.org changed reviewers:
+ dschuff@chromium.org, szager@chromium.org

[Derek Schuff, 2014-09-04 19:33:34]

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

https://codereview.chromium.org/546453003/diff/1/DEPS#newcode37
DEPS:37: 'nacl_revision': '32f8c257d2868f43c40bf464cd739bd79d12def7', # from svn
revision r13687
maybe we should also add the 3 lines of comment padding.

[szager1, 2014-09-04 20:52:43]

lgtm % comments

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

https://codereview.chromium.org/546453003/diff/1/DEPS#newcode37
DEPS:37: 'nacl_revision': '32f8c257d2868f43c40bf464cd739bd79d12def7', # from svn
revision r13687
On 2014/09/04 19:33:34, Derek Schuff wrote:
> maybe we should also add the 3 lines of comment padding.

yes, please do that.

[Mark Seaborn, 2014-09-04 21:34:43]

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

https://codereview.chromium.org/546453003/diff/1/DEPS#newcode37
DEPS:37: 'nacl_revision': '32f8c257d2868f43c40bf464cd739bd79d12def7', # from svn
revision r13687
On 2014/09/04 20:52:43, szager1 wrote:
> On 2014/09/04 19:33:34, Derek Schuff wrote:
> > maybe we should also add the 3 lines of comment padding.
> 
> yes, please do that.

OK, done.

[Mark Seaborn, 2014-09-04 21:34:52]

The CQ bit was checked by mseaborn@chromium.org

[commit-bot: I haz the power, 2014-09-04 21:37:51]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/mseaborn@chromium.org/546453003/20001

[commit-bot: I haz the power, 2014-09-05 00:09:03]

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

[commit-bot: I haz the power, 2014-09-05 00:09:05]

Try jobs failed on following builders:
  linux_gpu on tryserver.chromium.gpu
(http://build.chromium.org/p/tryserver.chromium.gpu/builders/linux_gpu/builds/...)
  mac_gpu on tryserver.chromium.gpu
(http://build.chromium.org/p/tryserver.chromium.gpu/builders/mac_gpu/builds/51864)
  mac_chromium_compile_dbg on tryserver.chromium.mac
(http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_comp...)
  mac_chromium_rel_swarming on tryserver.chromium.mac
(http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_rel_...)
  win_chromium_rel_swarming on tryserver.chromium.win
(http://build.chromium.org/p/tryserver.chromium.win/builders/win_chromium_rel_...)

[Mark Seaborn, 2014-09-05 00:51:05]

I've rebased this onto the revert that Derek committed.

Also, I noticed that the "nacl_trunk" var is unused, so I've removed that too.

[Mark Seaborn, 2014-09-05 00:51:12]

The CQ bit was checked by mseaborn@chromium.org

[commit-bot: I haz the power, 2014-09-05 00:51:58]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/mseaborn@chromium.org/546453003/40001

[commit-bot: I haz the power, 2014-09-05 01:34:07]

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

[commit-bot: I haz the power, 2014-09-05 01:34:07]

Try jobs failed on following builders:
  linux_gpu on tryserver.chromium.gpu
(http://build.chromium.org/p/tryserver.chromium.gpu/builders/linux_gpu/builds/...)
  ios_dbg_simulator on tryserver.chromium.mac
(http://build.chromium.org/p/tryserver.chromium.mac/builders/ios_dbg_simulator...)
  mac_chromium_compile_dbg on tryserver.chromium.mac
(http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_comp...)
  mac_chromium_rel_swarming on tryserver.chromium.mac
(http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_rel_...)

[Mark Seaborn, 2014-09-05 03:25:16]

The CQ bit was checked by mseaborn@chromium.org

[commit-bot: I haz the power, 2014-09-05 03:25:59]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/mseaborn@chromium.org/546453003/60001

[commit-bot: I haz the power, 2014-09-05 04:19:05]

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

[commit-bot: I haz the power, 2014-09-05 04:19:07]

Try jobs failed on following builders:
  mac_chromium_rel_swarming on tryserver.chromium.mac
(http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_rel_...)

[Mark Seaborn, 2014-09-05 04:55:45]

The CQ bit was checked by mseaborn@chromium.org

[commit-bot: I haz the power, 2014-09-05 04:56:25]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/mseaborn@chromium.org/546453003/60001

[commit-bot: I haz the power, 2014-09-05 05:06:42]

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

[commit-bot: I haz the power, 2014-09-05 05:06:43]

Try jobs failed on following builders:
  mac_chromium_rel_swarming on tryserver.chromium.mac
(http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_rel_...)

[Mark Seaborn, 2014-09-05 05:18:52]

The CQ bit was checked by mseaborn@chromium.org

[commit-bot: I haz the power, 2014-09-05 05:20:02]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/mseaborn@chromium.org/546453003/60001

[commit-bot: I haz the power, 2014-09-05 05:20:52]

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

[commit-bot: I haz the power, 2014-09-05 05:20:54]

Failed to apply patch for DEPS:
While running git apply --index -p1;
  error: patch failed: DEPS:27
  error: DEPS: patch does not apply

Patch:       DEPS
Index: DEPS
diff --git a/DEPS b/DEPS
index
aee3aef0626676fcd64b28dc8823162d8814fb27..8d9c2c1b8ca53b32fe232f9157408fe9ef6296dc
100644
--- a/DEPS
+++ b/DEPS
@@ -27,15 +27,12 @@ vars = {
   'libcxx_revision': '48198f9110397fff47fe7c37cbfa296be7d44d3d',
   'libcxxabi_revision': '4ad1009ab3a59fa7a6896d74d5e4de5885697f95',
   'webkit_trunk': 'http://src.chromium.org/blink/trunk',
-  'nacl_trunk': 'http://src.chromium.org/native_client/trunk',
   'webkit_revision': '9a051c526402aedfa6bc73e6699838c777b679cf', # from svn
revision 181337
   'chromium_git': 'https://chromium.googlesource.com',
   'chromiumos_git': 'https://chromium.googlesource.com/chromiumos',
   'pdfium_git': 'https://pdfium.googlesource.com',
   'skia_git': 'https://skia.googlesource.com',
   'boringssl_git': 'https://boringssl.googlesource.com',
-  # After changing nacl_revision, run 'glient sync' and check
native_client/DEPS
-  # to update other nacl_*_revision's.
   'libvpx_revision': '982d14793a8e42d2fa5e6e5e34bede17b4ba67e3', # r291730
   'sfntly_revision': '1bdaae8fc788a5ac8936d68bf24f37d977a13dac',
   'skia_revision': '26abcf10a4994a0bb13a074d79baa85cd8d67b2c',
@@ -87,6 +84,10 @@ vars = {
   # the commit queue can handle CLs rolling lss
   # and whatever else without interference from each other.
   'lss_revision': '952107fa7cea0daaabead28c0e92d579bee517eb',
+  # Three lines of non-changing comments so that
+  # the commit queue can handle CLs rolling NaCl
+  # and whatever else without interference from each other.
+  'nacl_revision': '61776de8bd9664c2186b08a36dacafddaa47896c', # from svn
revision r13679
 }
 
 deps = {
@@ -166,7 +167,7 @@ deps = {
     Var('chromium_git') + '/external/v8.git' + '@' +  Var('v8_revision'),
 
   'src/native_client':
-   Var('chromium_git') + '/native_client/src/native_client.git' + '@' +
'61776de8bd9664c2186b08a36dacafddaa47896c',
+   Var('chromium_git') + '/native_client/src/native_client.git' + '@' +
Var('nacl_revision'),
 
   'src/chrome/test/data/extensions/api_test/permissions/nacl_enabled/bin':
    Var('chromium_git') + '/native_client/src/native_client/tests/prebuilt.git'
+ '@' + '3e17365176c94624f46cace174f61834b7f3c35d',

[Mark Seaborn, 2014-09-05 06:16:37]

The CQ bit was checked by mseaborn@chromium.org

[commit-bot: I haz the power, 2014-09-05 06:17:30]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/mseaborn@chromium.org/546453003/80001

[commit-bot: I haz the power, 2014-09-05 08:01:12]

Committed patchset #5 (id:80001) as 095b626935b5355b22aac1e9eeb2d543c8ec127e

[commit-bot: I haz the power, 2014-09-10 03:37:34]

Patchset 5 (id:??) landed as
https://crrev.com/851e1bd141cd5a07241a7e7f7c4707ad4400fe10
Cr-Commit-Position: refs/heads/master@{#293462}