Merge M51: Prefer System Flash over non-local component updated Flash.

chrome/common/pepper_flash.h

Index: chrome/common/pepper_flash.h
diff --git a/chrome/common/pepper_flash.h b/chrome/common/pepper_flash.h
index f1756e75db39ac471fd2ae982ca664d4ffee0c0c..664016634c992fe41ad583f33aebcae187c090ac 100644
--- a/chrome/common/pepper_flash.h
+++ b/chrome/common/pepper_flash.h
@@ -18,6 +18,11 @@ extern const int32_t kPepperFlashPermissions;
 // manifest, with the version specified in the manifest in |version_out|.
 bool CheckPepperFlashManifest(const base::DictionaryValue& manifest,
                               base::Version* version_out);
+
+// Returns true if the version of Flash installed on the system is the Flash
+// Script debugger.
+bool IsSystemFlashScriptDebuggerPresent();
+
 }  // namespace chrome
 
 #endif  // CHROME_COMMON_PEPPER_FLASH_H_