Updating the compiler to use the new-world model

New compiler is integrated and passes first test (Fibonacci).

Change-Id: Ic5448ab89ebd22baa30fafc3d1300324687d1fc2
diff --git a/src/image_test.cc b/src/image_test.cc
index 8c00e89..7c1312b 100644
--- a/src/image_test.cc
+++ b/src/image_test.cc
@@ -4,8 +4,8 @@
 #include "file.h"
 #include "image.h"
 #include "image_writer.h"
-#include "os.h"
 #include "space.h"
+#include "utils.h"
 
 #include "gtest/gtest.h"
 
@@ -13,23 +13,6 @@
 
 class ImageTest : public CommonTest {};
 
-std::string ReadFileToString(const char* file_name) {
-  scoped_ptr<File> file(OS::OpenFile(file_name, false));
-  CHECK(file != NULL);
-
-  std::string contents;
-  char buf[8 * KB];
-  while (true) {
-    int64_t n = file->Read(buf, sizeof(buf));
-    CHECK_NE(-1, n);
-    if (n == 0) {
-        break;
-    }
-    contents.append(buf, n);
-  }
-  return contents;
-}
-
 TEST_F(ImageTest, WriteRead) {
 
   // TODO: move the touching of classes and GC to the ImageWriter proper