Move paint aggregator and the completion callback factory.

ppapi/tests/test_flash.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 PAPPI_TESTS_TEST_FLASH_H_
 #define PAPPI_TESTS_TEST_FLASH_H_
 
 #include <string>
 
-#include "ppapi/cpp/completion_callback.h"
 #include "ppapi/c/pp_stdint.h"
 #include "ppapi/tests/test_case.h"
+#include "ppapi/utility/completion_callback_factory.h"
 
 struct PPB_Flash;
 
 class TestFlash : public TestCase {
  public:
   explicit TestFlash(TestingInstance* instance);
 
   // TestCase implementation.
   virtual bool Init();
   virtual void RunTests(const std::string& filter);
 
  private:
   // TODO(viettrungluu): Implement the commented-out tests.
   std::string TestSetInstanceAlwaysOnTop();
   // std::string TestDrawGlyphs();
   std::string TestGetProxyForURL();
   // std::string TestNavigate();
   std::string TestMessageLoop();
   std::string TestGetLocalTimeZoneOffset();
   std::string TestGetCommandLineArgs();
 
   void QuitMessageLoopTask(int32_t);
 
   const PPB_Flash* flash_interface_;
   pp::CompletionCallbackFactory<TestFlash> callback_factory_;
 };
 
 #endif  // PAPPI_TESTS_TEST_FLASH_H_