Move paint aggregator and the completion callback factory.

ppapi/utility/graphics/paint_manager.h

Index: ppapi/utility/graphics/paint_manager.h
diff --git a/ppapi/cpp/paint_manager.h b/ppapi/utility/graphics/paint_manager.h
similarity index 97%
rename from ppapi/cpp/paint_manager.h
rename to ppapi/utility/graphics/paint_manager.h
index fbddd9fceaef1496a49f7bb8b3ffc52d62273430..c3787e8e328f78466487cf8691721cc4f20f2cef 100644
--- a/ppapi/cpp/paint_manager.h
+++ b/ppapi/utility/graphics/paint_manager.h
@@ -2,14 +2,14 @@
 // 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
@@ -294,4 +294,4 @@ class PaintManager {
 
 }  // namespace pp
 
-#endif  // PPAPI_CPP_PAINT_MANAGER_H_
+#endif  // PPAPI_UTILITY_GRAPHICS_PAINT_MANAGER_H_