| Index: chrome/common/chrome_content_client.cc
|
| diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc
|
| index 331b55144d24ddb1dcb23398b986e25ad5603e94..3c487c2ce80536703ed6f478043e2244a4af5f7e 100644
|
| --- a/chrome/common/chrome_content_client.cc
|
| +++ b/chrome/common/chrome_content_client.cc
|
| @@ -232,6 +232,10 @@ void AddPepperFlash(std::vector<content::PepperPluginInfo>* plugins) {
|
| #if defined(FLAPPER_AVAILABLE)
|
| if (!PathService::Get(chrome::FILE_PEPPER_FLASH_PLUGIN, &plugin.path))
|
| return;
|
| + // It is an error to have FLAPPER_AVAILABLE defined but then not having the
|
| + // plugin file in place, but this happens in Chrome OS builds.
|
| + // Use --disable-bundled-ppapi-flash to skip this.
|
| + DCHECK(file_util::PathExists(plugin.path));
|
| flash_version = FLAPPER_VERSION_STRING;
|
| #else
|
| LOG(ERROR) << "PPAPI Flash not included at build time.";
|
|
|