Support 'mac' architecture for system Flash installs on OS X.

chrome/common/pepper_flash.cc

Index: chrome/common/pepper_flash.cc
diff --git a/chrome/common/pepper_flash.cc b/chrome/common/pepper_flash.cc
index d7a5ac45ef5f11d9181e1a414027ba479eab89c4..cad919947ea4b0f1de6a064de174363a56b38ac5 100644
--- a/chrome/common/pepper_flash.cc
+++ b/chrome/common/pepper_flash.cc
@@ -126,8 +126,16 @@ bool CheckPepperFlashManifest(const base::DictionaryValue& manifest,
 
   std::string arch;
   manifest.GetStringASCII("x-ppapi-arch", &arch);
-  if (arch != kPepperFlashArch)
+  if (arch != kPepperFlashArch) {
+#if defined(OS_MACOSX)
+    // On Mac OS X the arch is 'x64' for component updated Flash but 'mac' for
+    // system Flash, so accept both variations.
+    if (arch != kPepperFlashOperatingSystem)
+      return false;
+#else
     return false;
+#endif
+  }
 
   *version_out = version;
   return true;