Bump nacl_revision. Re-enable integration tests.

BUG=89177
TEST=bots
Review URL: http://codereview.chromium.org/7395013

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92790 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 13 insertions, 11 deletions

diff --git a/DEPS b/DEPS
index afe9b09..dc0df00 100644
--- a/DEPS
+++ b/DEPS
@@ -9,10 +9,15 @@ vars = {
   "swig_revision": "69281",
   # These hashes need to be updated when nacl_revision is changed.
   # After changing nacl_revision, run 'gclient runhooks' to get the new values.
-  "nacl_irt_hash_x86_32": "40737ff789c03561a79dc7802f16e84d4dbe3b07",
-  "nacl_irt_hash_x86_64": "8d7d2f6f5ef19467981eb89ab2a138e79aa5926d",
-  "nacl_revision": "5988",  # If you update this, change ppapi below.
-  "nacl_tools_revision": "5360",  # tools_rev in native_client/DEPS
+  "nacl_irt_hash_x86_32": "dc4485ff3f68862c889976bcb7f1978242dedd3d",
+  "nacl_irt_hash_x86_64": "189ff1a20bd685d0120f693aa227e69169a030df",
+  "nacl_revision": "6081",
+  # After changing nacl_revision, run 'glient sync' and check native_client/DEPS
+  # to update other nacl_*_revision's.
+  # TODO(brettw) We should use the "From" syntax to avoid hardcoding the
+  # revisions here, but it makes checkdeps confused. We should fix checkdeps.
+  "nacl_chrome_ppapi_revision": "92654", # native_client/DEPS: chrome_ppapi_rev 
+  "nacl_tools_revision": "5360",  # native_client/DEPS: tools_rev
   "libjingle_revision": "73",
   "libvpx_revision": "90416",
   "ffmpeg_revision": "91042",
@@ -85,14 +90,9 @@ deps = {
     Var("nacl_trunk") + "/src/native_client@" + Var("nacl_revision"),
 
   "src/native_client/src/third_party/ppapi":
-    # TODO(brettw) We should use this "From" syntax to avoid hardcoding the
-    # revision here, but it makes checkdeps confused. We should fix checkdeps
-    # and re-enable the From() line.
-    #
-    # Currently, take the revision of PPAPI from the DEPS file of the NaCl
-    # revision you're pulling.
+    # TODO(brettw) enable the From() line instead when checkdeps is fixed.
     #From("src/native_client", "native_client/src/third_party/ppapi"),
-    "http://src.chromium.org/svn/trunk/src/ppapi@91987",
+    "/trunk/src/ppapi@" + Var("nacl_chrome_ppapi_revision"),
 
   "src/chrome/test/data/extensions/api_test/permissions/nacl_enabled/bin":
     Var("nacl_trunk") + "/src/native_client/tests/prebuilt@" +
@@ -238,6 +238,8 @@ deps = {
 
   # Needed to support nacl browser test jig.
   "src/third_party/pylib":
+    # TODO(brettw) enable the From() line instead when checkdeps is fixed.
+    #From("src/native_client", "native_client/src/third_party/pylib"),
     Var("nacl_trunk") + "/src/third_party/pylib@" + Var("nacl_tools_revision"),
   "src/third_party/scons-2.0.1":
     Var("nacl_trunk") + "/src/third_party/scons-2.0.1@" +