Merge r7353 to trunk

test/cctest/test-api.cc

Index: test/cctest/test-api.cc
===================================================================
--- test/cctest/test-api.cc	(revision 7355)
+++ test/cctest/test-api.cc	(working copy)
@@ -13092,7 +13092,14 @@
 
 class InitDefaultIsolateThread : public v8::internal::Thread {
  public:
-  enum TestCase { IgnoreOOM, SetResourceConstraints, SetFatalHandler };
+  enum TestCase {
+    IgnoreOOM,
+    SetResourceConstraints,
+    SetFatalHandler,
+    SetCounterFunction,
+    SetCreateHistogramFunction,
+    SetAddHistogramSampleFunction
+  };
 
   explicit InitDefaultIsolateThread(TestCase testCase)
       : Thread(NULL, "InitDefaultIsolateThread"),
@@ -13117,6 +13124,18 @@
     case SetFatalHandler:
       v8::V8::SetFatalErrorHandler(NULL);
       break;
+
+    case SetCounterFunction:
+      v8::V8::SetCounterFunction(NULL);
+      break;
+
+    case SetCreateHistogramFunction:
+      v8::V8::SetCreateHistogramFunction(NULL);
+      break;
+
+    case SetAddHistogramSampleFunction:
+      v8::V8::SetAddHistogramSampleFunction(NULL);
+      break;
     }
     result_ = true;
   }
@@ -13148,7 +13167,19 @@
   InitializeTestHelper(InitDefaultIsolateThread::SetFatalHandler);
 }
 
+TEST(InitializeDefaultIsolateOnSecondaryThread4) {
+  InitializeTestHelper(InitDefaultIsolateThread::SetCounterFunction);
+}
 
+TEST(InitializeDefaultIsolateOnSecondaryThread5) {
+  InitializeTestHelper(InitDefaultIsolateThread::SetCreateHistogramFunction);
+}
+
+TEST(InitializeDefaultIsolateOnSecondaryThread6) {
+  InitializeTestHelper(InitDefaultIsolateThread::SetAddHistogramSampleFunction);
+}
+
+
 TEST(StringCheckMultipleContexts) {
   const char* code =
       "(function() { return \"a\".charAt(0); })()";