Work on heap and space initialization to support image loading

Change-Id: Icab25efa4dee17e4b6c6e97e38f63f5ab8a8a005
diff --git a/src/class_linker_test.cc b/src/class_linker_test.cc
index 7e93e0d..21c576e 100644
--- a/src/class_linker_test.cc
+++ b/src/class_linker_test.cc
@@ -394,59 +394,59 @@
   scoped_ptr<DexFile> dex(OpenDexFileBase64(kStatics));
   PathClassLoader* class_loader = AllocPathClassLoader(dex.get());
   Class* statics = class_linker_->FindClass("LStatics;", class_loader);
-  // class_linker_->InitializeClass(statics);  // TODO uncomment this
+  // class_linker_->InitializeClass(statics);  // TODO: uncomment this
 
   EXPECT_EQ(10U, statics->NumStaticFields());
 
   Field* s0 = statics->GetStaticField(0);
   EXPECT_EQ("Ljava/lang/reflect/Field;", s0->GetClass()->descriptor_);
   EXPECT_EQ('Z', s0->GetType());
-//  EXPECT_EQ(true, s0->GetBoolean());  // TODO uncomment this
+//  EXPECT_EQ(true, s0->GetBoolean());  // TODO: uncomment this
   s0->SetBoolean(false);
 
   Field* s1 = statics->GetStaticField(1);
   EXPECT_EQ('B', s1->GetType());
-//  EXPECT_EQ(5, s1->GetByte());  // TODO uncomment this
+//  EXPECT_EQ(5, s1->GetByte());  // TODO: uncomment this
   s1->SetByte(6);
 
   Field* s2 = statics->GetStaticField(2);
   EXPECT_EQ('C', s2->GetType());
-//  EXPECT_EQ('a', s2->GetChar());  // TODO uncomment this
+//  EXPECT_EQ('a', s2->GetChar());  // TODO: uncomment this
   s2->SetChar('b');
 
   Field* s3 = statics->GetStaticField(3);
   EXPECT_EQ('S', s3->GetType());
-//  EXPECT_EQ(65000, s3->GetShort());  // TODO uncomment this
+//  EXPECT_EQ(65000, s3->GetShort());  // TODO: uncomment this
   s3->SetShort(65001);
 
   Field* s4 = statics->GetStaticField(4);
   EXPECT_EQ('I', s4->GetType());
-//  EXPECT_EQ(2000000000, s4->GetInt());  // TODO uncomment this
+//  EXPECT_EQ(2000000000, s4->GetInt());  // TODO: uncomment this
   s4->SetInt(2000000001);
 
   Field* s5 = statics->GetStaticField(5);
   EXPECT_EQ('J', s5->GetType());
-//  EXPECT_EQ(0x1234567890abcdefLL, s5->GetLong());  // TODO uncomment this
+//  EXPECT_EQ(0x1234567890abcdefLL, s5->GetLong());  // TODO: uncomment this
   s5->SetLong(0x34567890abcdef12LL);
 
   Field* s6 = statics->GetStaticField(6);
   EXPECT_EQ('F', s6->GetType());
-//  EXPECT_EQ(0.5, s6->GetFloat());  // TODO uncomment this
+//  EXPECT_EQ(0.5, s6->GetFloat());  // TODO: uncomment this
   s6->SetFloat(0.75);
 
   Field* s7 = statics->GetStaticField(7);
   EXPECT_EQ('D', s7->GetType());
-//  EXPECT_EQ(16777217, s7->GetDouble());  // TODO uncomment this
+//  EXPECT_EQ(16777217, s7->GetDouble());  // TODO: uncomment this
   s7->SetDouble(16777219);
 
   Field* s8 = statics->GetStaticField(8);
   EXPECT_EQ('L', s8->GetType());
-//  EXPECT_TRUE(down_cast<String*>(s8->GetObject())->Equals("android"));  // TODO uncomment this
+//  EXPECT_TRUE(down_cast<String*>(s8->GetObject())->Equals("android"));  // TODO: uncomment this
   s8->SetObject(String::AllocFromAscii("robot"));
 
   Field* s9 = statics->GetStaticField(9);
   EXPECT_EQ('[', s9->GetType());
-//  EXPECT_EQ(NULL, s9->GetObject());  // TODO uncomment this
+//  EXPECT_EQ(NULL, s9->GetObject());  // TODO: uncomment this
   s9->SetObject(NULL);
 
   EXPECT_EQ(false,                s0->GetBoolean());