Merge missing r18658 from bleeding_edge and add missing files.

test/cctest/trace-extension.h

Index: test/cctest/trace-extension.h
diff --git a/test/cctest/profiler-extension.h b/test/cctest/trace-extension.h
similarity index 70%
copy from test/cctest/profiler-extension.h
copy to test/cctest/trace-extension.h
index 392a7efbc753907f105c039a8f4a7aa85fa2065b..b80b3d45dc81579629ddccb6761cfa709b17e4e9 100644
--- a/test/cctest/profiler-extension.h
+++ b/test/cctest/trace-extension.h
@@ -1,4 +1,4 @@
-// Copyright 2013 the V8 project authors. All rights reserved.
+// Copyright 2014 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,31 +24,33 @@
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Tests of profiles generator and utilities.
 
-#ifndef V8_TEST_CCTEST_PROFILER_EXTENSION_H_
-#define V8_TEST_CCTEST_PROFILER_EXTENSION_H_
+#ifndef V8_TEST_CCTEST_TRACE_EXTENSION_H_
+#define V8_TEST_CCTEST_TRACE_EXTENSION_H_
 
-#include "../include/v8-profiler.h"
+#include "v8.h"
 
 namespace v8 {
 namespace internal {
 
-class ProfilerExtension : public v8::Extension {
+class TraceExtension : public v8::Extension {
  public:
-  ProfilerExtension() : v8::Extension("v8/profiler", kSource) { }
+  TraceExtension() : v8::Extension("v8/trace", kSource) { }
   virtual v8::Handle<v8::FunctionTemplate> GetNativeFunctionTemplate(
       v8::Isolate* isolate,
       v8::Handle<v8::String> name);
-  static void StartProfiling(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void StopProfiling(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static const v8::CpuProfile* last_profile;
+  static void Trace(const v8::FunctionCallbackInfo<v8::Value>& args);
+  static void JSTrace(const v8::FunctionCallbackInfo<v8::Value>& args);
+  static void JSEntrySP(const v8::FunctionCallbackInfo<v8::Value>& args);
+  static void JSEntrySPLevel2(const v8::FunctionCallbackInfo<v8::Value>& args);
+  static Address GetJsEntrySp();
+  static void InitTraceEnv(TickSample* sample);
+  static void DoTrace(Address fp);
  private:
+  static Address GetFP(const v8::FunctionCallbackInfo<v8::Value>& args);
   static const char* kSource;
 };
 
-
 } }  // namespace v8::internal
 
 #endif