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

ppapi/ppapi_sources.gypi

 # 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.
 
 {
   'variables': {
     'c_source_files': [
       'c/pp_bool.h',
       'c/pp_completion_callback.h',
       'c/pp_errors.h',
@@ skipping 133 matching lines @@
       'cpp/input_event.cc',
       'cpp/input_event.h',
       'cpp/instance.cc',
       'cpp/instance.h',
       'cpp/logging.h',
       'cpp/module.cc',
       'cpp/module.h',
       'cpp/module_impl.h',
       'cpp/mouse_lock.cc',
       'cpp/mouse_lock.h',
+      'cpp/non_thread_safe_ref_count.h',
+      'cpp/paint_aggregator.cc',
+      'cpp/paint_aggregator.h',
+      'cpp/paint_manager.cc',
+      'cpp/paint_manager.h',
       'cpp/point.h',
       'cpp/rect.cc',
       'cpp/rect.h',
       'cpp/resource.cc',
       'cpp/resource.h',
       'cpp/size.h',
       'cpp/url_loader.cc',
       'cpp/url_loader.h',
       'cpp/url_request_info.cc',
       'cpp/url_request_info.h',
@@ skipping 76 matching lines @@
       'cpp/private/udp_socket_private.cc',
       'cpp/private/udp_socket_private.h',
       'cpp/private/var_private.cc',
       'cpp/private/var_private.h',
 
       # Trusted interfaces.
       'cpp/trusted/file_chooser_trusted.cc',
       'cpp/trusted/file_chooser_trusted.h',
       'cpp/trusted/file_io_trusted.cc',
       'cpp/trusted/file_io_trusted.h',
-
-      # Utility sources.
-      'utility/completion_callback_factory.h',
-      'utility/non_thread_safe_ref_count.h',
-      'utility/graphics/paint_aggregator.cc',
-      'utility/graphics/paint_aggregator.h',
-      'utility/graphics/paint_manager.cc',
-      'utility/graphics/paint_manager.h',
     ],
     #
     # Common Testing source for trusted and untrusted (NaCl) pugins.
     #
     'test_common_source_files': [
       # Common test files
       'tests/all_c_includes.h',
       'tests/all_cpp_includes.h',
       'tests/arch_dependent_sizes_32.h',
       'tests/arch_dependent_sizes_64.h',
@@ skipping 126 matching lines @@
           'c/dev/ppb_transport_dev.h',
         ],
         'cpp_source_files': [
           'cpp/dev/transport_dev.cc',
           'cpp/dev/transport_dev.h',
         ],
       },
     }],
   ],
 }