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

ppapi/native_client/src/trusted/plugin/file_downloader.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_FILE_DOWNLOADER_H_
 #define NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_FILE_DOWNLOADER_H_
 
 #include <deque>
 
 #include "native_client/src/include/nacl_macros.h"
 #include "native_client/src/include/nacl_string.h"
 #include "ppapi/c/trusted/ppb_file_io_trusted.h"
 #include "ppapi/c/trusted/ppb_url_loader_trusted.h"
+#include "ppapi/cpp/completion_callback.h"
 #include "ppapi/cpp/file_io.h"
 #include "ppapi/cpp/url_loader.h"
 #include "ppapi/cpp/instance.h"
-#include "ppapi/utility/completion_callback_factory.h"
 
 namespace plugin {
 
 class Plugin;
 
 typedef enum {
   DOWNLOAD_TO_FILE = 0 << 0,
   DOWNLOAD_TO_BUFFER = 1 << 0
 } DownloadFlags;
 
@@ skipping 91 matching lines @@
   pp::CompletionCallbackFactory<FileDownloader> callback_factory_;
   int64_t open_time_;
   DownloadFlags flags_;
   static const uint32_t kTempBufferSize = 1024;
   char temp_buffer_[kTempBufferSize];
   std::deque<char> buffer_;
   UrlSchemeType url_scheme_;
 };
 }  // namespace plugin;
 #endif  // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_FILE_DOWNLOADER_H_