Move paint aggregator and the completion callback factory.

ppapi/proxy/ppb_url_loader_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_PPB_URL_LOADER_PROXY_H_
 #define PPAPI_PPB_URL_LOADER_PROXY_H_
 
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/c/pp_module.h"
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/c/pp_size.h"
 #include "ppapi/c/pp_var.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/host_resource.h"
+#include "ppapi/utility/completion_callback_factory.h"
 
 struct PPB_URLLoader;
 struct PPB_URLLoaderTrusted;
 
 namespace ppapi {
 
 struct PPB_URLRequestInfo_Data;
 
 namespace proxy {
 
@@ skipping 64 matching lines @@
 
   // Valid only in the host, this lazily-initialized pointer indicates the
   // URLLoaderTrusted interface.
   const PPB_URLLoaderTrusted* host_urlloader_trusted_interface_;
 };
 
 }  // namespace proxy
 }  // namespace ppapi
 
 #endif  // PPAPI_PPB_URL_LOADER_PROXY_H_