Update from chromium 62675d9fb31fb8cedc40f68e78e8445a74f362e7

cc/test/tiled_layer_test_common.h

 // Copyright 2012 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_TEST_TILED_LAYER_TEST_COMMON_H_
 #define CC_TEST_TILED_LAYER_TEST_COMMON_H_
 
 #include "cc/base/region.h"
 #include "cc/layers/tiled_layer.h"
 #include "cc/layers/tiled_layer_impl.h"
 #include "cc/resources/layer_updater.h"
 #include "cc/resources/prioritized_resource.h"
 #include "cc/resources/resource_provider.h"
 #include "cc/resources/resource_update_queue.h"
-#include "ui/gfx/rect.h"
-#include "ui/gfx/size.h"
+#include "ui/gfx/geometry/rect.h"
+#include "ui/gfx/geometry/size.h"
 
 namespace cc {
 
 class FakeTiledLayer;
 
 class FakeLayerUpdater : public LayerUpdater {
  public:
   class Resource : public LayerUpdater::Resource {
    public:
     Resource(FakeLayerUpdater* updater,
@@ skipping 120 matching lines @@
   ~FakeTiledLayerWithScaledBounds() override;
   gfx::Size forced_content_bounds_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FakeTiledLayerWithScaledBounds);
 };
 
 }  // namespace cc
 
 #endif  // CC_TEST_TILED_LAYER_TEST_COMMON_H_