Pull NaCl deps, remove temporary hack to keep the build compiling in PPAPI....

ppapi/cpp/var.h

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef PPAPI_CPP_VAR_H_
 #define PPAPI_CPP_VAR_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 36 matching lines @@
   // class instance..
   struct DontManage {};
   Var(DontManage, PP_Var var) {
     var_ = var;
     needs_release_ = false;
   }
 
   // Takes ownership of the given pointer.
   Var(Instance* instance, deprecated::ScriptableObject* object);
 
-  // TODO(brettw) erase this! This is a temporary hack to keep the build
-  // going while we land the nacl side of this change. Calling this function
-  // will crash rather than break the compile.
-  Var(deprecated::ScriptableObject* /* object */) {
-    *(int*)0 = 3;
-  }
-
   Var(const Var& other);
 
   virtual ~Var();
 
   Var& operator=(const Var& other);
 
   bool operator==(const Var& other) const;
 
   bool is_undefined() const { return var_.type == PP_VARTYPE_UNDEFINED; }
   bool is_null() const { return var_.type == PP_VARTYPE_NULL; }
@@ skipping 132 matching lines @@
   // get a compilation error.
   Var(void* non_scriptable_object_pointer);
 
   PP_Var var_;
   bool needs_release_;
 };
 
 }  // namespace pp
 
 #endif  // PPAPI_CPP_VAR_H_