Update from chromium 62675d9fb31fb8cedc40f68e78e8445a74f362e7

cc/resources/texture_mailbox.h

 // 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.
 
 #ifndef CC_RESOURCES_TEXTURE_MAILBOX_H_
 #define CC_RESOURCES_TEXTURE_MAILBOX_H_
 
 #include <string>
 
-#include "base/callback.h"
 #include "base/memory/shared_memory.h"
 #include "cc/base/cc_export.h"
 #include "gpu/command_buffer/common/mailbox_holder.h"
-#include "ui/gfx/size.h"
+#include "ui/gfx/geometry/size.h"
 
 namespace cc {
 
 // TODO(skaslev, danakj) Rename this class more apropriately since now it
 // can hold a shared memory resource as well as a texture mailbox.
 class CC_EXPORT TextureMailbox {
  public:
   TextureMailbox();
   explicit TextureMailbox(const gpu::MailboxHolder& mailbox_holder);
   TextureMailbox(const gpu::Mailbox& mailbox, uint32 target, uint32 sync_point);
@@ skipping 25 matching lines @@
  private:
   gpu::MailboxHolder mailbox_holder_;
   base::SharedMemory* shared_memory_;
   gfx::Size shared_memory_size_;
   bool allow_overlay_;
 };
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_TEXTURE_MAILBOX_H_