Move paint aggregator and the completion callback factory.

ppapi/utility/graphics/paint_manager.h

 // Copyright (c) 2011 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 PPAPI_CPP_PAINT_MANAGER_H_
-#define PPAPI_CPP_PAINT_MANAGER_H_
+#ifndef PPAPI_UTILITY_GRAPHICS_PAINT_MANAGER_H_
+#define PPAPI_UTILITY_GRAPHICS_PAINT_MANAGER_H_
 
 #include <vector>
 
-#include "ppapi/cpp/completion_callback.h"
 #include "ppapi/cpp/graphics_2d.h"
-#include "ppapi/cpp/paint_aggregator.h"
+#include "ppapi/utility/completion_callback_factory.h"
+#include "ppapi/utility/graphics/paint_aggregator.h"
 
 /// @file
 /// This file defines the API to convert the "plugin push" model of painting
 /// in PPAPI to a paint request at a later time.
 
 namespace pp {
 
 class Graphics2D;
 class Instance;
 class Point;
@@ skipping 264 matching lines @@
 
   // When we get a resize, we don't bind right away (see SetSize). The
   // has_pending_resize_ tells us that we need to do a resize for the next
   // paint operation. When true, the new size is in pending_size_.
   bool has_pending_resize_;
   Size pending_size_;
 };
 
 }  // namespace pp
 
-#endif  // PPAPI_CPP_PAINT_MANAGER_H_
+#endif  // PPAPI_UTILITY_GRAPHICS_PAINT_MANAGER_H_