Resubmitting r18013.

runtime/vm/dart_api_impl.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_DART_API_IMPL_H_
 #define VM_DART_API_IMPL_H_
 
 #include "vm/allocation.h"
 #include "vm/object.h"
 
@@ skipping 40 matching lines @@
            "Dart_EnterScope?", CURRENT_FUNC);                                  \
     }                                                                          \
   } while (0)
 
 #define DARTSCOPE(isolate)                                                     \
   Isolate* __temp_isolate__ = (isolate);                                       \
   CHECK_ISOLATE_SCOPE(__temp_isolate__);                                       \
   HANDLESCOPE(__temp_isolate__);
 
 
-const char* CheckIsolateState(Isolate *isolate);
-
 void SetupErrorResult(Dart_Handle* handle);
 
 
 class Api : AllStatic {
  public:
   // Creates a new local handle.
   static Dart_Handle NewHandle(Isolate* isolate, RawObject* raw);
 
   // Unwraps the raw object from the handle.
   static RawObject* UnwrapHandle(Dart_Handle object);
@@ skipping 18 matching lines @@
   static FinalizablePersistentHandle* UnwrapAsWeakPersistentHandle(
       const ApiState& state,
       Dart_Handle object);
 
   // Validates and converts the passed in handle as a prologue weak
   // persistent handle.
   static FinalizablePersistentHandle* UnwrapAsPrologueWeakPersistentHandle(
       const ApiState& state,
       Dart_Handle object);
 
+  // Returns an Error handle if isolate is in an inconsistent state.
+  // Returns a Success handle when no error condition exists.
+  static Dart_Handle CheckIsolateState(Isolate *isolate);
+
   // Casts the internal Isolate* type to the external Dart_Isolate type.
   static Dart_Isolate CastIsolate(Isolate* isolate);
 
   // Gets the handle used to designate successful return.
   static Dart_Handle Success(Isolate* isolate);
 
   // Sets up the callback error object after initializing an Isolate. This
   // object is pre-created because we will not be able to allocate this
   // object when the error actually occurs. When the error occurs there will
   // be outstanding acquires to internal data pointers making it unsafe to
@@ skipping 78 matching lines @@
   isolate->DecrementNoCallbackScopeDepth()
 
 #define CHECK_CALLBACK_STATE(isolate)                                          \
   if (isolate->no_callback_scope_depth() != 0) {                               \
     return reinterpret_cast<Dart_Handle>(Api::CallbackError(isolate));         \
   }                                                                            \
 
 }  // namespace dart.
 
 #endif  // VM_DART_API_IMPL_H_