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

ppapi/proxy/ppb_file_io_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_FILE_IO_PROXY_H_
 #define PPAPI_PROXY_PPB_FILE_IO_PROXY_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "ppapi/c/pp_file_info.h"
 #include "ppapi/proxy/interface_proxy.h"
 #include "ppapi/proxy/proxy_non_thread_safe_ref_count.h"
-#include "ppapi/utility/completion_callback_factory.h"
 
 namespace ppapi {
 
 class HostResource;
 namespace proxy {
 
 class PPB_FileIO_Proxy : public InterfaceProxy {
  public:
   explicit PPB_FileIO_Proxy(Dispatcher* dispatcher);
   virtual ~PPB_FileIO_Proxy();
@@ skipping 60 matching lines @@
   pp::CompletionCallbackFactory<PPB_FileIO_Proxy,
                                 ProxyNonThreadSafeRefCount> callback_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PPB_FileIO_Proxy);
 };
 
 }  // namespace proxy
 }  // namespace ppapi
 
 #endif  // PPAPI_PROXY_PPB_FILE_IO_PROXY_H_