Update from chromium 62675d9fb31fb8cedc40f68e78e8445a74f362e7

cc/surfaces/surface_aggregator_test_helpers.h

 // 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.
 
 #ifndef CC_SURFACES_SURFACE_AGGREGATOR_TEST_HELPERS_H_
 #define CC_SURFACES_SURFACE_AGGREGATOR_TEST_HELPERS_H_
 
 #include "cc/base/scoped_ptr_vector.h"
 #include "cc/quads/draw_quad.h"
 #include "cc/quads/render_pass_id.h"
 #include "cc/surfaces/surface_id.h"
 #include "third_party/skia/include/core/SkColor.h"
-#include "ui/gfx/size.h"
+#include "ui/gfx/geometry/size.h"
 
 namespace cc {
 
 class RenderPass;
 class Surface;
 class TestRenderPass;
 
 typedef ScopedPtrVector<RenderPass> RenderPassList;
 
 namespace test {
@@ skipping 62 matching lines @@
 void TestPassMatchesExpectations(Pass expected_pass, const RenderPass* pass);
 
 void TestPassesMatchExpectations(Pass* expected_passes,
                                  size_t expected_pass_count,
                                  const RenderPassList* passes);
 
 }  // namespace test
 }  // namespace cc
 
 #endif  // CC_SURFACES_SURFACE_AGGREGATOR_TEST_HELPERS_H_