Remove the deprecated method invocation and field access apis from the

vm/snapshot_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_debugger_api.h"
 #include "platform/assert.h"
 #include "vm/bigint_operations.h"
 #include "vm/class_finalizer.h"
 #include "vm/dart_api_impl.h"
 #include "vm/dart_api_message.h"
@@ skipping 808 matching lines @@
   // from the script.
   Timer timer2(true, "Snapshot_test");
   timer2.Start();
   TestCase::CreateTestIsolateFromSnapshot(buffer);
   {
     Dart_EnterScope();  // Start a Dart API scope for invoking API functions.
     timer2.Stop();
     OS::PrintErr("From Snapshot: %dus\n", timer2.TotalElapsedTime());
 
     // Invoke a function which returns an object.
-    result = Dart_InvokeStatic(TestCase::lib(),
-                               Dart_NewString("FieldsTest"),
-                               Dart_NewString("testMain"),
-                               0,
-                               NULL);
+    Dart_Handle cls =
+        Dart_GetClass(TestCase::lib(), Dart_NewString("FieldsTest"));
+    result = Dart_Invoke(cls, Dart_NewString("testMain"), 0, NULL);
     EXPECT_VALID(result);
     Dart_ExitScope();
   }
   Dart_ShutdownIsolate();
   free(buffer);
 }
 
 
 UNIT_TEST_CASE(FullSnapshot1) {
   // This buffer has to be static for this to compile with Visual Studio.
@@ skipping 20 matching lines @@
     Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);
     ClassFinalizer::FinalizePendingClasses();
     timer1.Stop();
     OS::PrintErr("Without Snapshot: %dus\n", timer1.TotalElapsedTime());
 
     // Write snapshot with object content.
     SnapshotWriter writer(Snapshot::kFull, &buffer, &malloc_allocator);
     writer.WriteFullSnapshot();
 
     // Invoke a function which returns an object.
-    Dart_Handle result = Dart_InvokeStatic(lib,
-                               Dart_NewString("FieldsTest"),
-                               Dart_NewString("testMain"),
-                               0,
-                               NULL);
+    Dart_Handle cls = Dart_GetClass(lib, Dart_NewString("FieldsTest"));
+    Dart_Handle result = Dart_Invoke(cls, Dart_NewString("testMain"), 0, NULL);
     EXPECT_VALID(result);
   }
 
   // Now Create another isolate using the snapshot and execute a method
   // from the script.
   Timer timer2(true, "Snapshot_test");
   timer2.Start();
   TestCase::CreateTestIsolateFromSnapshot(buffer);
   {
     Dart_EnterScope();  // Start a Dart API scope for invoking API functions.
     timer2.Stop();
     OS::PrintErr("From Snapshot: %dus\n", timer2.TotalElapsedTime());
 
     // Invoke a function which returns an object.
-    Dart_Handle result = Dart_InvokeStatic(TestCase::lib(),
-                               Dart_NewString("FieldsTest"),
-                               Dart_NewString("testMain"),
-                               0,
-                               NULL);
+    Dart_Handle cls = Dart_GetClass(TestCase::lib(),
+                                    Dart_NewString("FieldsTest"));
+    Dart_Handle result = Dart_Invoke(cls, Dart_NewString("testMain"), 0, NULL);
     if (Dart_IsError(result)) {
       // Print the error.  It is probably an unhandled exception.
       fprintf(stderr, "%s\n", Dart_GetError(result));
     }
     EXPECT_VALID(result);
     Dart_ExitScope();
   }
   Dart_ShutdownIsolate();
   free(buffer);
 }
@@ skipping 103 matching lines @@
     EXPECT_VALID(result);
 
     // Get list of library URLs loaded and compare with expected count.
     Dart_Handle libs = Dart_GetLibraryURLs();
     EXPECT(Dart_IsList(libs));
     Dart_ListLength(libs, &actual_num_libs);
 
     EXPECT_EQ(expected_num_libs, actual_num_libs);
 
     // Invoke a function which returns an object.
-    result = Dart_InvokeStatic(result,
-                               Dart_NewString("FieldsTest"),
-                               Dart_NewString("testMain"),
-                               0,
-                               NULL);
+    Dart_Handle cls = Dart_GetClass(result, Dart_NewString("FieldsTest"));
+    result = Dart_Invoke(cls, Dart_NewString("testMain"), 0, NULL);
     EXPECT_VALID(result);
     Dart_ExitScope();
   }
   Dart_ShutdownIsolate();
   free(full_snapshot);
   free(script_snapshot);
 }
 
 
 TEST_CASE(IntArrayMessage) {
@@ skipping 20 matching lines @@
   }
   CheckEncodeDecodeMessage(root);
 }
 
 
 // Helper function to call a top level Dart function, serialize the
 // result and deserialize the result into a Dart_CObject structure.
 static Dart_CObject* GetDeserializedDartMessage(Dart_Handle lib,
                                                 const char* dart_function) {
   Dart_Handle result;
-  result = Dart_InvokeStatic(lib,
-                             Dart_NewString(""),
-                             Dart_NewString(dart_function),
-                             0,
-                             NULL);
+  result = Dart_Invoke(lib, Dart_NewString(dart_function), 0, NULL);
   EXPECT_VALID(result);
 
   // Serialize the list into a message.
   uint8_t* buffer;
   SnapshotWriter writer(Snapshot::kMessage, &buffer, &zone_allocator);
   const Object& list = Object::Handle(Api::UnwrapHandle(result));
   writer.WriteObject(list.raw());
   writer.FinalizeBuffer();
 
   // Read object back from the snapshot into a C structure.
@@ skipping 20 matching lines @@
 
   TestCase::CreateTestIsolate();
   Isolate* isolate = Isolate::Current();
   EXPECT(isolate != NULL);
   Dart_EnterScope();
 
   Dart_Handle lib = TestCase::LoadTestScript(kCustomIsolateScriptChars,
                                              NULL);
   EXPECT_VALID(lib);
   Dart_Handle smi_result;
-  smi_result = Dart_InvokeStatic(lib,
-                                 Dart_NewString(""),
-                                 Dart_NewString("getSmi"),
-                                 0,
-                                 NULL);
+  smi_result = Dart_Invoke(lib, Dart_NewString("getSmi"), 0, NULL);
   EXPECT_VALID(smi_result);
   Dart_Handle bigint_result;
-  bigint_result = Dart_InvokeStatic(lib,
-                                    Dart_NewString(""),
-                                    Dart_NewString("getBigint"),
-                                    0,
-                                    NULL);
+  bigint_result = Dart_Invoke(lib, Dart_NewString("getBigint"), 0, NULL);
   EXPECT_VALID(bigint_result);
   Dart_Handle string_result;
-  string_result = Dart_InvokeStatic(lib,
-                                    Dart_NewString(""),
-                                    Dart_NewString("getString"),
-                                    0,
-                                    NULL);
+  string_result = Dart_Invoke(lib, Dart_NewString("getString"), 0, NULL);
   EXPECT_VALID(string_result);
   EXPECT(Dart_IsString(string_result));
 
   {
     DARTSCOPE_NOCHECKS(isolate);
 
     {
       Zone zone(Isolate::Current());
       uint8_t* buffer;
       SnapshotWriter writer(Snapshot::kMessage, &buffer, &zone_allocator);
@@ skipping 348 matching lines @@
       "    }\n"
       "    messageCount++;\n"
       "    if (messageCount == 8) throw new Exception(exception);\n"
       "  });\n"
       "  return port.toSendPort();\n"
       "}\n";
   Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);
   Dart_EnterScope();
 
   // xxx
-  Dart_Handle send_port = Dart_InvokeStatic(lib,
-                                            Dart_NewString(""),
-                                            Dart_NewString("main"),
-                                            0,
-                                            NULL);
+  Dart_Handle send_port = Dart_Invoke(lib, Dart_NewString("main"), 0, NULL);
   EXPECT_VALID(send_port);
   Dart_Handle result = Dart_GetField(send_port, Dart_NewString("_id"));
   ASSERT(!Dart_IsError(result));
   ASSERT(Dart_IsInteger(result));
   int64_t send_port_id;
   Dart_Handle result2 = Dart_IntegerToInt64(result, &send_port_id);
   ASSERT(!Dart_IsError(result2));
 
   // Setup single object message.
   Dart_CObject object;
@@ skipping 49 matching lines @@
   EXPECT(Dart_ErrorHasException(result));
   EXPECT_SUBSTRING("Exception: nulltruefalse1234563.14[]100123456789\n",
                    Dart_GetError(result));
 
   Dart_ExitScope();
 }
 
 #endif  // defined(TARGET_ARCH_IA32) || defined(TARGET_ARCH_X64).
 
 }  // namespace dart