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

ppapi/proxy/ppb_graphics_3d_proxy.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_PROXY_PPB_GRAPHICS_3D_PROXY_H_
 #define PPAPI_PROXY_PPB_GRAPHICS_3D_PROXY_H_
 
 #include <vector>
 
 #include "base/shared_memory.h"
 #include "gpu/command_buffer/common/command_buffer.h"
 #include "ppapi/c/pp_graphics_3d.h"
 #include "ppapi/c/pp_instance.h"
+#include "ppapi/cpp/completion_callback.h"
 #include "ppapi/proxy/interface_proxy.h"
 #include "ppapi/proxy/proxy_non_thread_safe_ref_count.h"
 #include "ppapi/shared_impl/ppb_graphics_3d_shared.h"
 #include "ppapi/shared_impl/resource.h"
-#include "ppapi/utility/completion_callback_factory.h"
 
 namespace ppapi {
 
 class HostResource;
 
 namespace proxy {
 
 class Graphics3D : public Resource, public PPB_Graphics3D_Shared {
  public:
   explicit Graphics3D(const HostResource& resource);
@@ skipping 82 matching lines @@
                                 ProxyNonThreadSafeRefCount> callback_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PPB_Graphics3D_Proxy);
 };
 
 }  // namespace proxy
 }  // namespace ppapi
 
 #endif  // PPAPI_PROXY_PPB_GRAPHICS_3D_PROXY_H_