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

chrome/common/pepper_flash.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/common/pepper_flash.h"
 
 #include <stddef.h>
 
 #include "base/strings/string_split.h"
 #include "base/values.h"
@@ skipping 108 matching lines @@
     return true;
   }
 
   std::string os;
   manifest.GetStringASCII("x-ppapi-os", &os);
   if (os != kPepperFlashOperatingSystem)
     return false;
 
   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;
 }
 
 bool IsSystemFlashScriptDebuggerPresent() {
 #if defined(OS_WIN)
   const wchar_t kFlashRegistryRoot[] =
       L"SOFTWARE\\Macromedia\\FlashPlayerPepper";
   const wchar_t kIsDebuggerValueName[] = L"isScriptDebugger";
 
   base::win::RegKey path_key(HKEY_LOCAL_MACHINE, kFlashRegistryRoot, KEY_READ);
   DWORD debug_value;
   if (path_key.ReadValueDW(kIsDebuggerValueName, &debug_value) != ERROR_SUCCESS)
     return false;
 
   return (debug_value == 1);
 #else
   // TODO(wfh): implement this on OS X and Linux. crbug.com/497996.
   return false;
 #endif
 }
 
 }  // namespace chrome