Revert of Fix Chromium build

tests/MatrixClipCollapseTest.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "Test.h"
-
-#ifdef SK_COLLAPSE_MATRIX_CLIP_STATE
-
 #include "SkCanvas.h"
 #include "SkDebugCanvas.h"
 #include "SkPicture.h"
 #include "SkPictureFlat.h"
 #include "SkPictureRecord.h"
 
 // This test exercises the Matrix/Clip State collapsing system. It generates
 // example skps and the compares the actual stored operations to the expected
 // operations. The test works by emitting canvas operations at three levels:
 // overall structure, bodies that draw something and model/clip state changes.
@@ skipping 26 matching lines @@
 //      - not sure if this would be useful since it somewhat duplicates the
 //        correctness test of running render_pictures in record mode and
 //        rendering before and after images. Additionally the matrix/clip collapse
 //        is sure to cause some small differences so an automated test might
 //        yield too many false positives.
 //   run the matrix/clip collapse system on the 10K skp set
 //      - this should give us warm fuzzies that the matrix clip collapse
 //        system is ready for prime time
 //   bench the recording times with/without matrix/clip collapsing
 
+#ifdef SK_COLLAPSE_MATRIX_CLIP_STATE
 
 // Enable/disable debugging helper code
 //#define TEST_COLLAPSE_MATRIX_CLIP_STATE 1
 
 // Extract the command ops from the input SkPicture
 static void gets_ops(SkPicture& input, SkTDArray<DrawType>* ops) {
     SkDebugCanvas debugCanvas(input.width(), input.height());
     debugCanvas.setBounds(input.width(), input.height());
     input.draw(&debugCanvas);
 
@@ skipping 655 matching lines @@
             }
         }
     }
 }
 
 DEF_TEST(MatrixClipCollapse, reporter) {
     test_collapse(reporter);
 }
 
 #endif