Revert "Hide Isolate pointer from embedder"

runtime/vm/unit_test.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_UNIT_TEST_H_
 #define VM_UNIT_TEST_H_
 
 #include "include/dart_native_api.h"
 
 #include "platform/globals.h"
 
 #include "vm/ast.h"
 #include "vm/dart.h"
-#include "vm/dart_api_impl.h"
 #include "vm/globals.h"
 #include "vm/heap.h"
 #include "vm/isolate.h"
 #include "vm/longjump.h"
 #include "vm/object.h"
 #include "vm/object_store.h"
 #include "vm/simulator.h"
 #include "vm/zone.h"
 
 // The UNIT_TEST_CASE macro is used for tests that do not need any
@@ skipping 256 matching lines @@
                                      Dart_Handle url);
   static char* BigintToHexValue(Dart_CObject* bigint);
 
   virtual void Run();
 
  private:
   static Dart_Isolate CreateIsolate(const uint8_t* buffer,
                                     const char* name) {
     char* err;
     Dart_Isolate isolate = Dart_CreateIsolate(name, NULL, buffer, NULL, &err);
-    if (isolate == DART_ILLEGAL_ISOLATE) {
+    if (isolate == NULL) {
       OS::Print("Creation of isolate failed '%s'\n", err);
       free(err);
     }
-    EXPECT(isolate != DART_ILLEGAL_ISOLATE);
+    EXPECT(isolate != NULL);
     return isolate;
   }
 
   RunEntry* const run_;
 };
 
 
 class TestIsolateScope {
  public:
   TestIsolateScope() {
-    isolate_ = TestCase::CreateTestIsolate();
+    isolate_ = reinterpret_cast<Isolate*>(TestCase::CreateTestIsolate());
     Dart_EnterScope();  // Create a Dart API scope for unit tests.
   }
   ~TestIsolateScope() {
     Dart_ExitScope();  // Exit the Dart API scope created for unit tests.
-    ASSERT(isolate_ == Api::CastIsolate(Isolate::Current()));
+    ASSERT(isolate_ == Isolate::Current());
     Dart_ShutdownIsolate();
-    isolate_ = DART_ILLEGAL_ISOLATE;
+    isolate_ = NULL;
   }
-  Isolate* isolate() const { return Api::CastIsolate(isolate_); }
+  Isolate* isolate() const { return isolate_; }
 
  private:
-  Dart_Isolate isolate_;
+  Isolate* isolate_;
 
   DISALLOW_COPY_AND_ASSIGN(TestIsolateScope);
 };
 
 
 class AssemblerTest {
  public:
   AssemblerTest(const char* name, Assembler* assembler)
       : name_(name),
         assembler_(assembler),
@@ skipping 95 matching lines @@
       }                                                                        \
     } else {                                                                   \
       dart::Expect(__FILE__, __LINE__).Fail("expected True, but was '%s'\n",   \
           #handle);                                                            \
     }                                                                          \
   } while (0)
 
 }  // namespace dart
 
 #endif  // VM_UNIT_TEST_H_