cc: Move surfaces hittesting test helpers out to a separate file

cc/test/surface_aggregator_test_helpers.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/surfaces/surface_aggregator_test_helpers.h"
+#include "cc/test/surface_aggregator_test_helpers.h"
 
 #include "base/format_macros.h"
 #include "base/strings/stringprintf.h"
 #include "cc/layers/append_quads_data.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/delegated_frame_data.h"
 #include "cc/quads/render_pass_draw_quad.h"
 #include "cc/quads/shared_quad_state.h"
 #include "cc/quads/solid_color_draw_quad.h"
 #include "cc/quads/surface_draw_quad.h"
@@ skipping 18 matching lines @@
 
   SharedQuadState* shared_quad_state = pass->CreateAndAppendSharedQuadState();
   shared_quad_state->SetAll(layer_to_target_transform, layer_bounds,
                             visible_layer_rect, clip_rect, is_clipped, opacity,
                             blend_mode, 0);
 
   SurfaceDrawQuad* surface_quad =
       pass->CreateAndAppendDrawQuad<SurfaceDrawQuad>();
   gfx::Rect quad_rect = gfx::Rect(surface_size);
   surface_quad->SetNew(pass->shared_quad_state_list.back(),
-                       gfx::Rect(surface_size),
-                       gfx::Rect(surface_size),
+                       gfx::Rect(surface_size), gfx::Rect(surface_size),
                        surface_id);
 }
 void AddRenderPassQuad(RenderPass* pass, RenderPassId render_pass_id) {
   gfx::Rect output_rect = gfx::Rect(0, 0, 5, 5);
   SharedQuadState* shared_state = pass->CreateAndAppendSharedQuadState();
-  shared_state->SetAll(gfx::Transform(),
-                       output_rect.size(),
-                       output_rect,
-                       output_rect,
-                       false,
-                       1,
-                       SkXfermode::kSrcOver_Mode,
-                       0);
+  shared_state->SetAll(gfx::Transform(), output_rect.size(), output_rect,
+                       output_rect, false, 1, SkXfermode::kSrcOver_Mode, 0);
   RenderPassDrawQuad* quad =
       pass->CreateAndAppendDrawQuad<RenderPassDrawQuad>();
-  quad->SetNew(shared_state,
-               output_rect,
-               output_rect,
-               render_pass_id,
-               0,
-               gfx::Vector2dF(),
-               gfx::Size(),
-               FilterOperations(),
-               gfx::Vector2dF(),
-               FilterOperations());
+  quad->SetNew(shared_state, output_rect, output_rect, render_pass_id, 0,
+               gfx::Vector2dF(), gfx::Size(), FilterOperations(),
+               gfx::Vector2dF(), FilterOperations());
 }
 
 void AddQuadInPass(RenderPass* pass, Quad desc) {
   switch (desc.material) {
     case DrawQuad::SOLID_COLOR:
       AddQuad(pass, gfx::Rect(0, 0, 5, 5), desc.color);
       break;
     case DrawQuad::SURFACE_CONTENT:
       AddSurfaceQuad(pass, gfx::Size(5, 5), desc.opacity, desc.surface_id);
       break;
@@ skipping 62 matching lines @@
 
   for (size_t i = 0; i < passes->size(); ++i) {
     SCOPED_TRACE(base::StringPrintf("Pass number %" PRIuS, i));
     RenderPass* pass = passes->at(i);
     TestPassMatchesExpectations(expected_passes[i], pass);
   }
 }
 
 }  // namespace test
 }  // namespace cc