Update from chromium 62675d9fb31fb8cedc40f68e78e8445a74f362e7

cc/layers/layer_utils_unittest.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/layers/layer_utils.h"
 
 #include "cc/animation/transform_operations.h"
 #include "cc/layers/layer_impl.h"
 #include "cc/test/animation_test_common.h"
 #include "cc/test/fake_impl_proxy.h"
 #include "cc/test/fake_layer_tree_host_impl.h"
 #include "cc/test/test_shared_bitmap_manager.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "ui/gfx/box_f.h"
+#include "ui/gfx/geometry/box_f.h"
 #include "ui/gfx/test/gfx_util.h"
 
 namespace cc {
 namespace {
 
 float diagonal(float width, float height) {
   return std::sqrt(width * width + height * height);
 }
 
 class LayerUtilsGetAnimationBoundsTest : public testing::Test {
@@ skipping 233 matching lines @@
   child()->SetPosition(gfx::PointF(150.f, 50.f));
   child()->SetBounds(bounds);
 
   gfx::BoxF box;
   bool success = LayerUtils::GetAnimationBounds(*child(), &box);
   EXPECT_FALSE(success);
 }
 
 }  // namespace
 }  // namespace cc