Revert 116281 - Move paint aggregator and the completion callback factory.

gpu/demos/framework/pepper.cc

 // 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.
 
 #include <GLES2/gl2.h>
 
 #include "gpu/demos/framework/demo.h"
 #include "gpu/demos/framework/demo_factory.h"
 #include "ppapi/cpp/completion_callback.h"
 #include "ppapi/cpp/graphics_3d.h"
 #include "ppapi/cpp/instance.h"
 #include "ppapi/cpp/module.h"
 #include "ppapi/cpp/rect.h"
 #include "ppapi/cpp/size.h"
 #include "ppapi/lib/gl/gles2/gl2ext_ppapi.h"
-#include "ppapi/utility/completion_callback_factory.h"
 
 namespace gpu {
 namespace demos {
 
 class PluginInstance : public pp::Instance {
  public:
   PluginInstance(PP_Instance instance, pp::Module* module)
       : pp::Instance(instance),
         module_(module),
         demo_(CreateDemo()),
@@ skipping 112 matching lines @@
 }  // namespace gpu
 
 namespace pp {
 
 Module* CreateModule() {
   return new gpu::demos::PluginModule();
 }
 
 }  // namespace pp