commit 9baa4aefc370f48774b6104680193d9a7e4fb631
author Brian Carlstrom <bdc@google.com> Thu Sep 01 21:14:14 2011 -0700
committer Brian Carlstrom <bdc@google.com> Sat Sep 03 13:25:31 2011 -0700
tree 26ed5735022c29f77d6b025c357674ecf50b27c8
parent e9ea8d1f002dd86976f0e1493ab8aa23a66c0494

Remove use of MemMap for code allocation.

In preparation of moving to an executable code space.

Change-Id: I6cb6fec93c66005f8020d718fe3c1c5aa1c85356

src/jni_compiler_test.cc

diff --git a/src/jni_compiler_test.cc b/src/jni_compiler_test.cc
index 3ef970e..933970b 100644
--- a/src/jni_compiler_test.cc
+++ b/src/jni_compiler_test.cc
@@ -22,9 +22,7 @@
  protected:
   virtual void SetUp() {
     CommonTest::SetUp();
-    dex_.reset(OpenTestDexFile("MyClassNatives"));
-    class_loader_ = AllocPathClassLoader(dex_.get());
-    Thread::Current()->SetClassLoaderOverride(class_loader_);
+    class_loader_ = LoadDex("MyClassNatives");
   }
 
   void SetupForTest(bool direct, const char* method_name,
@@ -44,7 +42,7 @@
     ASSERT_TRUE(method != NULL);
 
     // Compile the native method
-    jni_compiler.Compile(&jni_asm, method);
+    CompileMethod(method);
     ASSERT_TRUE(method->HasCode());
 
     if (direct) {
@@ -66,10 +64,9 @@
   static jclass jklass_;
   static jobject jobj_;
  protected:
-  UniquePtr<const DexFile> dex_;
-  const PathClassLoader* class_loader_;
-  Assembler jni_asm;
-  JniCompiler jni_compiler;
+  const ClassLoader* class_loader_;
+  Assembler jni_asm_;
+  JniCompiler jni_compiler_;
   JNIEnv* env_;
   jmethodID jmethod_;
 };