Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5233)

Unified Diff: chrome/browser/component_updater/test/component_installers_unittest.cc

Issue 10702188: Fix unit test to allow repeated successful runs by avoiding a function static variable in tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add DEPS file Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/component_updater/test/component_installers_unittest.cc
diff --git a/chrome/browser/component_updater/component_installers_unittest.cc b/chrome/browser/component_updater/test/component_installers_unittest.cc
similarity index 91%
rename from chrome/browser/component_updater/component_installers_unittest.cc
rename to chrome/browser/component_updater/test/component_installers_unittest.cc
index 1b11497865540f0fd4603635c9212113e1adc02e..e7a4ee1a891e288f724511e79c3d8daf90cdca0e 100644
--- a/chrome/browser/component_updater/component_installers_unittest.cc
+++ b/chrome/browser/component_updater/test/component_installers_unittest.cc
@@ -14,6 +14,7 @@
#include "build/build_config.h"
#include "chrome/common/chrome_paths.h"
#include "content/public/test/test_browser_thread.h"
+#include "ppapi/shared_impl/test_globals.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -42,6 +43,10 @@ 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::SetPpapiGlobalsOnThreadForTest(&test_globals);
+
// The test directory is chrome/test/data/components/flapper.
FilePath manifest;
PathService::Get(chrome::DIR_TEST_DATA, &manifest);

Powered by Google App Engine
This is Rietveld 408576698