Move paint aggregator and the completion callback factory.

ppapi/utility/graphics/paint_aggregator.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_AGGREGATOR_H_
-#define PPAPI_CPP_PAINT_AGGREGATOR_H_
+#ifndef PPAPI_UTILITY_GRAPHICS_PAINT_AGGREGATOR_H_
+#define PPAPI_UTILITY_GRAPHICS_PAINT_AGGREGATOR_H_
 
 #include <stddef.h>
 #include <vector>
 
 #include "ppapi/cpp/point.h"
 #include "ppapi/cpp/rect.h"
 
 /// @file
 /// This file defines the API to aggregate multiple invalidation and scroll
 /// commands to produce a scroll and repaint sequence.
@@ skipping 147 matching lines @@
   // start combining paint rects (see CombinePaintRects). This limiting can be
   // important since there is typically some overhead in deciding what to
   // paint. If your plugin is fast at doing these computations, raise this
   // threshold, if your plugin is slow, lower it (probably requires some
   // tuning to find the right value).
   size_t max_paint_rects_;
 };
 
 }  // namespace pp
 
-#endif  // PPAPI_CPP_PAINT_AGGREGATOR_H_
+#endif  // PPAPI_UTILITY_PAINT_AGGREGATOR_H_