Merge SafeStackTraceFrameIterator into SafeStackFrameIterator

src/frames.h

Index: src/frames.h
diff --git a/src/frames.h b/src/frames.h
index 5c3acf2b861af6209c647e35b123df8dc39258f3..1a78d09b15fc114eddde1b29b1ecf6fbe3e6c282 100644
--- a/src/frames.h
+++ b/src/frames.h
@@ -874,18 +874,16 @@ class SafeStackFrameIterator BASE_EMBEDDED {
                          Address fp, Address sp,
                          Address low_bound, Address high_bound);
 
-  StackFrame* frame() const {
-    ASSERT(!iteration_done_);
-    return iterator_.frame();
-  }
+  inline JavaScriptFrame* frame() const;
 
   bool done() const { return iteration_done_ || iterator_.done(); }
-
   void Advance();
 
   static bool is_active(Isolate* isolate);
 
  private:
+  void AdvanceOneFrame();
+
   static bool IsWithinBounds(
       Address low_bound, Address high_bound, Address addr) {
     return low_bound <= addr && addr <= high_bound;
@@ -945,24 +943,6 @@ class SafeStackFrameIterator BASE_EMBEDDED {
 };
 
 
-class SafeStackTraceFrameIterator BASE_EMBEDDED {
- public:
-  SafeStackTraceFrameIterator(Isolate* isolate,
-                              Address fp,
-                              Address sp,
-                              Address low_bound,
-                              Address high_bound);
-
-  inline JavaScriptFrame* frame() const;
-
-  bool done() const { return iterator_.done(); }
-  void Advance();
-
- private:
-  SafeStackFrameIterator iterator_;
-};
-
-
 class StackFrameLocator BASE_EMBEDDED {
  public:
   explicit StackFrameLocator(Isolate* isolate) : iterator_(isolate) {}