Update from chromium 62675d9fb31fb8cedc40f68e78e8445a74f362e7

cc/output/filter_operations_unittest.cc

 // Copyright 2013 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/output/filter_operations.h"
 #include "skia/ext/refptr.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/effects/SkBlurImageFilter.h"
-#include "ui/gfx/point.h"
+#include "ui/gfx/geometry/point.h"
 
 namespace cc {
 namespace {
 
 TEST(FilterOperationsTest, GetOutsetsBlur) {
   FilterOperations ops;
   ops.Append(FilterOperation::CreateBlurFilter(20));
   int top, right, bottom, left;
   top = right = bottom = left = 0;
   ops.GetOutsets(&top, &right, &bottom, &left);
@@ skipping 674 matching lines @@
   blended = to.Blend(from, -0.75);
   EXPECT_EQ(to, blended);
   blended = to.Blend(from, 0.75);
   EXPECT_EQ(to, blended);
   blended = to.Blend(from, 1.5);
   EXPECT_EQ(to, blended);
 }
 
 }  // namespace
 }  // namespace cc