Index: chrome/common/chrome_content_client.cc |
diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc |
index 50740e3ef5da54079be91a35da34596177416f57..c07fb0e7ee3cd91e99a74e2c351fbab34ddce886 100644 |
--- a/chrome/common/chrome_content_client.cc |
+++ b/chrome/common/chrome_content_client.cc |
@@ -298,6 +298,9 @@ bool GetBundledPepperFlash(content::PepperPluginInfo* plugin, |
*plugin = CreatePepperFlashInfo(flash_path, FLAPPER_VERSION_STRING); |
*override_npapi_flash = force_enable || IsPepperFlashEnabledByDefault(); |
+ |
+ // TODO(shess): http://crbug.com/153383 debugging. |
yzshen1
2012/10/02 23:33:44
IIRC, at this point the field trial list hasn't be
Scott Hess - ex-Googler
2012/10/02 23:42:31
OK - would it make sense to tuck it into Conductin
yzshen1
2012/10/02 23:52:10
I guess not, because ConductingPepperFlashFieldTri
Scott Hess - ex-Googler
2012/10/03 19:38:51
Oops, sorry - I hadn't read this before just movin
yzshen1
2012/10/03 19:58:36
Yay!
|
+ ActivatePepperFlashThreadFieldTrial(); |
return true; |
#else |
return false; |