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

ppapi/native_client/src/trusted/plugin/pnacl_resources.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 NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PNACL_RESOURCES_H_
 #define NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PNACL_RESOURCES_H_
 
 #include <map>
 #include <vector>
 
 #include "native_client/src/include/nacl_macros.h"
 #include "native_client/src/include/nacl_string.h"
 #include "native_client/src/shared/srpc/nacl_srpc.h"
 #include "native_client/src/trusted/desc/nacl_desc_wrapper.h"
 #include "native_client/src/trusted/plugin/delayed_callback.h"
 #include "native_client/src/trusted/plugin/plugin_error.h"
-#include "ppapi/utility/completion_callback_factory.h"
+
+#include "ppapi/cpp/completion_callback.h"
 
 namespace plugin {
 
 class Manifest;
 class Plugin;
 class PnaclCoordinator;
 
 
 // Loads a list of remote resources, providing a way to get file descriptors for
 // thse resources.  All URLs in relative to resource_base_url_.
@@ skipping 46 matching lines @@
   // Because we may be loading multiple resources, we need a callback that
   // is invoked each time a resource arrives, and finally invokes
   // all_loaded_callback_ when done.
   nacl::scoped_ptr<DelayedCallback> delayed_callback_;
   // Factory for ready callbacks, etc.
   pp::CompletionCallbackFactory<PnaclResources> callback_factory_;
 };
 
 }  // namespace plugin;
 #endif  // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PNACL_RESOURCES_H_