Update from chromium 62675d9fb31fb8cedc40f68e78e8445a74f362e7

cc/resources/prioritized_resource_manager.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_RESOURCES_PRIORITIZED_RESOURCE_MANAGER_H_
 #define CC_RESOURCES_PRIORITIZED_RESOURCE_MANAGER_H_
 
 #include <list>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/containers/hash_tables.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
 #include "cc/base/cc_export.h"
 #include "cc/resources/prioritized_resource.h"
 #include "cc/resources/priority_calculator.h"
 #include "cc/resources/resource.h"
-#include "cc/trees/proxy.h"
-#include "ui/gfx/size.h"
+#include "ui/gfx/geometry/size.h"
 
 namespace cc {
 
-class PriorityCalculator;
 class Proxy;
 
 class CC_EXPORT PrioritizedResourceManager {
  public:
   static scoped_ptr<PrioritizedResourceManager> Create(const Proxy* proxy) {
     return make_scoped_ptr(new PrioritizedResourceManager(proxy));
   }
   scoped_ptr<PrioritizedResource> CreateTexture(
       const gfx::Size& size, ResourceFormat format) {
     return make_scoped_ptr(new PrioritizedResource(this, size, format));
@@ skipping 193 matching lines @@
   // Statistics copied at the time of PushTexturePrioritiesToBackings.
   size_t memory_visible_last_pushed_bytes_;
   size_t memory_visible_and_nearby_last_pushed_bytes_;
 
   DISALLOW_COPY_AND_ASSIGN(PrioritizedResourceManager);
 };
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_PRIORITIZED_RESOURCE_MANAGER_H_