Merge bleeding_edge r17376:17693.

test/cctest/cctest.status

Index: test/cctest/cctest.status
diff --git a/test/cctest/cctest.status b/test/cctest/cctest.status
index 59bf8268e988a976a351b2125d5207cb1d57244c..58550d83ebba74c8813138be8ceade65c754bb9e 100644
--- a/test/cctest/cctest.status
+++ b/test/cctest/cctest.status
@@ -63,6 +63,13 @@
 }],  # ALWAYS
 
 ##############################################################################
+['system == windows', {
+
+  # BUG(2999).
+  'test-cpu-profiler/CollectCpuProfile': [PASS, FAIL],
+}],  # 'system == windows'
+
+##############################################################################
 ['arch == arm', {
 
   # We cannot assume that we can throw OutOfMemory exceptions in all situations.
@@ -80,6 +87,7 @@
   'test-serialize/DeserializeAndRunScript2': [SKIP],
   'test-serialize/DeserializeFromSecondSerialization': [SKIP],
 }],  # 'arch == arm'
+
 ##############################################################################
 ['arch == mipsel', {
 
@@ -132,5 +140,8 @@
 
   # Fails since 16322 (new test).
   'test-code-stubs-arm/ConvertDToI': [SKIP],
+
+  # BUG(2998).
+  'test-macro-assembler-arm/LoadAndStoreWithRepresentation': [SKIP],
 }],  # 'arch == nacl_ia32 or arch == nacl_x64'
 ]