Upgrade to Node v6

atom/common/api/atom_api_native_image.cc

@@ -63,7 +63,7 @@ float GetScaleFactorFromPath(const base::FilePath& path) {
 
   // We don't try to convert string to float here because it is very very
   // expensive.
-  for (unsigned i = 0; i < arraysize(kScaleFactorPairs); ++i) {
+  for (unsigned i = 0; i < node::arraysize(kScaleFactorPairs); ++i) {
     if (base::EndsWith(filename, kScaleFactorPairs[i].name,
                        base::CompareCase::INSENSITIVE_ASCII))
       return kScaleFactorPairs[i].scale;

atom/common/node_includes.h

@@ -21,6 +21,7 @@
 #undef CHECK_LT
 #undef DISALLOW_COPY_AND_ASSIGN
 #undef NO_RETURN
+#undef arraysize
 #undef debug_string  // This is defined in OS X 10.9 SDK in AssertMacros.h.
 #include "vendor/node/src/env.h"
 #include "vendor/node/src/env-inl.h"