Fix presubmit and check failures introduced by r5284.

Review URL: http://codereview.chromium.org/3141021

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@5285 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

src/mark-compact.cc

@@ -518,15 +518,15 @@ class StaticMarkingVisitor : public StaticVisitorBase {
     if (!ctx->IsHeapObject()) return false;
 
     Map* map = SafeMap(ctx);
-    if(!(map == Heap::raw_unchecked_context_map() ||
-         map == Heap::raw_unchecked_catch_context_map() ||
-         map == Heap::raw_unchecked_global_context_map())) {
+    if (!(map == Heap::raw_unchecked_context_map() ||
+          map == Heap::raw_unchecked_catch_context_map() ||
+          map == Heap::raw_unchecked_global_context_map())) {
       return false;
     }
 
     Context* context = reinterpret_cast<Context*>(ctx);
 
-    if(IsJSBuiltinsObject(context->global())) {
+    if (IsJSBuiltinsObject(context->global())) {
       return false;
     }
 

test/cctest/test-heap.cc

@@ -975,6 +975,7 @@ TEST(TestCodeFlushing) {
 
   CHECK(function->shared()->is_compiled());
 
+  Heap::CollectAllGarbage(true);
   Heap::CollectAllGarbage(true);
   Heap::CollectAllGarbage(true);
   Heap::CollectAllGarbage(true);