Pepper: Introduce ThreadAwareCallback.

chrome/browser/component_updater/test/component_installers_unittest.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/component_updater/flash_component_installer.h"
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 25 matching lines @@
     FILE_PATH_LITERAL("components/flapper/NONEXISTENT");
 #endif
 #endif
 }
 
 // TODO(viettrungluu): Separate out into two separate tests; use a test fixture.
 TEST(ComponentInstallerTest, PepperFlashCheck) {
   MessageLoop message_loop;
   content::TestBrowserThread ui_thread(BrowserThread::UI, &message_loop);
 
-  ppapi::PpapiGlobals::ForTest for_test;
-  ppapi::TestGlobals test_globals(for_test);
+  ppapi::PpapiGlobals::ForPerThreadTest for_per_thread_test;
+  ppapi::TestGlobals test_globals(for_per_thread_test);
   ppapi::PpapiGlobals::SetPpapiGlobalsOnThreadForTest(&test_globals);
 
   // The test directory is chrome/test/data/components/flapper.
   FilePath manifest;
   PathService::Get(chrome::DIR_TEST_DATA, &manifest);
   manifest = manifest.Append(kDataPath);
   manifest = manifest.AppendASCII("manifest.json");
 
   if (!file_util::PathExists(manifest)) {
     LOG(WARNING) << "No test manifest available. Skipping.";
     return;
   }
 
   JSONFileValueSerializer serializer(manifest);
   std::string error;
   scoped_ptr<base::Value> root(serializer.Deserialize(NULL, &error));
   ASSERT_TRUE(root.get() != NULL);
   ASSERT_TRUE(root->IsType(base::Value::TYPE_DICTIONARY));
 
   // This checks that the whole manifest is compatible.
   Version version;
   EXPECT_TRUE(CheckPepperFlashManifest(
       static_cast<base::DictionaryValue*>(root.get()), &version));
   EXPECT_TRUE(version.IsValid());
 }