- Ensure that BaseIsolate is only used to break the header include cycles.

runtime/vm/timer.h

 // Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #ifndef VM_TIMER_H_
 #define VM_TIMER_H_
 
 #include "platform/utils.h"
 #include "vm/allocation.h"
 #include "vm/flags.h"
@@ skipping 117 matching lines @@
 // The class TimerScope is used to start and stop a timer within a scope.
 // It is used as follows:
 // {
 //   TimerScope timer(FLAG_name_of_flag, timer, isolate);
 //   .....
 //   code that needs to be timed.
 //   ....
 // }
 class TimerScope : public StackResource {
  public:
-  TimerScope(bool flag, Timer* timer, BaseIsolate* isolate = NULL)
+  TimerScope(bool flag, Timer* timer, Isolate* isolate = NULL)
       : StackResource(isolate), flag_(flag), nested_(false), timer_(timer) {
     if (flag_) {
       if (!timer_->running()) {
         timer_->Start();
       } else {
         nested_ = true;
       }
     }
   }
   ~TimerScope() {
     if (flag_) {
       if (!nested_) {
         timer_->Stop();
       }
     }
   }
 
  private:
   const bool flag_;
   bool nested_;
   Timer* const timer_;
 
   DISALLOW_ALLOCATION();
   DISALLOW_COPY_AND_ASSIGN(TimerScope);
 };
 
 
 class PauseTimerScope : public StackResource {
  public:
-  PauseTimerScope(bool flag, Timer* timer, BaseIsolate* isolate = NULL)
+  PauseTimerScope(bool flag, Timer* timer, Isolate* isolate = NULL)
       : StackResource(isolate), flag_(flag), nested_(false), timer_(timer) {
     if (flag_) {
       if (timer_->running()) {
         timer_->Stop();
       } else {
         nested_ = true;
       }
     }
   }
   ~PauseTimerScope() {
@@ skipping 25 matching lines @@
   TimerScope vm_internal_timer_(true, &(isolate->timer_list().name()), isolate)
 
 #define PAUSETIMERSCOPE(isolate, name)                                         \
 PauseTimerScope vm_internal_timer_(true,                                       \
                                    &(isolate->timer_list().name()),            \
                                    isolate)
 
 }  // namespace dart
 
 #endif  // VM_TIMER_H_