- Proper inclusion of gypi files, so that they do not override

vm/dart_api_impl_test.cc

 // Copyright (c) 2012, 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.
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "platform/utils.h"
 #include "vm/class_finalizer.h"
 #include "vm/dart_api_impl.h"
 #include "vm/dart_api_state.h"
@@ skipping 2809 matching lines @@
       "  final int fld2;\n"
       "  static int fld3;\n"
       "  static final int fld4 = 10;\n"
       "}\n"
       "class NativeFieldsTest {\n"
       "  static NativeFields testMain() {\n"
       "    NativeFields obj = new NativeFields(10, 20);\n"
       "    return obj;\n"
       "  }\n"
       "}\n";
-  Dart_Handle result;
   const int kNumNativeFields = 4;
 
   // Create a test library.
   Dart_Handle lib = TestCase::LoadTestScript(kScriptChars,
                                              native_field_lookup);
 
   // Create a native wrapper class with native fields.
-  result = Dart_CreateNativeWrapperClass(
+  Dart_Handle result = Dart_CreateNativeWrapperClass(
       lib,
       Dart_NewString("NativeFieldsWrapper"),
       kNumNativeFields);
+  EXPECT_VALID(result);
 
   // Load up a test script in it.
 
   // Invoke a function which returns an object of type NativeFields.
   Dart_Handle retobj = Dart_InvokeStatic(lib,
                                          Dart_NewString("NativeFieldsTest"),
                                          Dart_NewString("testMain"),
                                          0,
                                          NULL);
   EXPECT_VALID(retobj);
@@ skipping 1884 matching lines @@
   // We should have received the expected number of interrupts.
   EXPECT_EQ(kInterruptCount, interrupt_count);
 
   // Give the spawned thread enough time to properly exit.
   Isolate::SetInterruptCallback(saved);
 }
 
 #endif  // defined(TARGET_ARCH_IA32) || defined(TARGET_ARCH_X64).
 
 }  // namespace dart