Update from chromium 62675d9fb31fb8cedc40f68e78e8445a74f362e7

cc/debug/invalidation_benchmark.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/debug/invalidation_benchmark.h"
 
 #include <algorithm>
 #include <limits>
 
 #include "base/basictypes.h"
 #include "base/rand_util.h"
 #include "base/values.h"
 #include "cc/layers/layer.h"
 #include "cc/layers/picture_layer.h"
 #include "cc/trees/layer_tree_host.h"
 #include "cc/trees/layer_tree_host_common.h"
-#include "ui/gfx/rect.h"
+#include "ui/gfx/geometry/rect.h"
 
 namespace cc {
 
 namespace {
 
 const char* kDefaultInvalidationMode = "viewport";
 
 }  // namespace
 
 InvalidationBenchmark::InvalidationBenchmark(
@@ skipping 102 matching lines @@
 // high quality, but they need to be identical in each run. Therefore, we use a
 // LCG and keep the state locally in the benchmark.
 float InvalidationBenchmark::LCGRandom() {
   const uint32 a = 1664525;
   const uint32 c = 1013904223;
   seed_ = a * seed_ + c;
   return static_cast<float>(seed_) / std::numeric_limits<uint32>::max();
 }
 
 }  // namespace cc