Pulling new nacl into chrome, which now uses a single ppapi copy.

DEPS

 vars = {
   # Use this googlecode_url variable only if there is an internal mirror for it.
   # If you do not know, use the full path while defining your new deps entry.
   "googlecode_url": "http://%s.googlecode.com/svn",
   "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk",
   "nacl_trunk": "http://src.chromium.org/native_client/trunk",
   "webkit_revision": "93705",
   "chromium_git": "http://git.chromium.org/git",
   "swig_revision": "69281",
-  "nacl_revision": "6499",
+  "nacl_revision": "6539",
   # 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": "97134", # native_client/DEPS: chrome_ppapi_rev 
   "nacl_tools_revision": "5360",  # native_client/DEPS: tools_rev
 
   # These hashes need to be updated when nacl_toolchain_revision is changed.
   # After changing nacl_toolchain_revision, run 'gclient runhooks' to get the
   # new values.
   "nacl_toolchain_mac_x86_newlib_hash":
       "1b0855435c03c435a011c6105a509624b2a4edaa",
   "nacl_toolchain_win_x86_newlib_hash":
       "5038a47b5a9a49acdc36cbe311aec7bce575c164",
   "nacl_toolchain_linux_x86_newlib_hash":
@@ skipping 69 matching lines @@
 
   "src/tools/gyp":
     (Var("googlecode_url") % "gyp") + "/trunk@1013",
 
   "src/v8":
     (Var("googlecode_url") % "v8") + "/trunk@" + Var("v8_revision"),
 
   "src/native_client":
     Var("nacl_trunk") + "/src/native_client@" + Var("nacl_revision"),
 
-  "src/native_client/src/third_party/ppapi":
-    # TODO(brettw) enable the From() line instead when checkdeps is fixed.
-    #From("src/native_client", "native_client/src/third_party/ppapi"),
-    "/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@" +
     Var("nacl_revision"),
 
   "src/third_party/sfntly/src/sfntly":
     (Var("googlecode_url") % "sfntly") + "/trunk/cpp/src/sfntly@" +
     Var("sfntly_revision"),
 
   "src/third_party/skia/gpu":
     (Var("googlecode_url") % "skia") + "/trunk/gpu@" + Var("skia_revision"),
@@ skipping 301 matching lines @@
          "--file-hash", "linux_x86_newlib",
              Var("nacl_toolchain_linux_x86_newlib_hash"),
     ],
   },
   {
     # A change to a .gyp, .gypi, or to GYP itself should run the generator.
     "pattern": ".",
     "action": ["python", "src/build/gyp_chromium"],
   },
 ]