Register system Pepper Flash plugin if no packaged Pepper plugin is found.

chrome/common/chrome_paths.cc

Index: chrome/common/chrome_paths.cc
diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc
index af56236b4ed642995420578008df28d515b6605b..3ae4e595044519dcdc48899d4cfb0e151eb68209 100644
--- a/chrome/common/chrome_paths.cc
+++ b/chrome/common/chrome_paths.cc
@@ -46,8 +46,11 @@ const base::FilePath::CharType kPepperFlashBaseDirectory[] =
     FILE_PATH_LITERAL("PepperFlash");
 
 #if defined(OS_WIN)
-const base::FilePath::CharType kPepperFlashDebuggerBaseDirectory[] =
+const base::FilePath::CharType kPepperFlashSystemBaseDirectory[] =
     FILE_PATH_LITERAL("Macromed\\Flash");
+#elif defined(OS_MACOSX)
+const base::FilePath::CharType kPepperFlashSystemBaseDirectory[] =
+    FILE_PATH_LITERAL("Internet Plug-Ins/PepperFlashPlayer");
 #endif
 
 // File name of the internal PDF plugin on different platforms.
@@ -261,16 +264,17 @@ bool PathProvider(int key, base::FilePath* result) {
         return false;
       cur = cur.Append(kPepperFlashBaseDirectory);
       break;
-    case chrome::DIR_PEPPER_FLASH_DEBUGGER_PLUGIN:
+    case chrome::DIR_PEPPER_FLASH_SYSTEM_PLUGIN:
 #if defined(OS_WIN)
       if (!PathService::Get(base::DIR_SYSTEM, &cur))
         return false;
-      cur = cur.Append(kPepperFlashDebuggerBaseDirectory);
+      cur = cur.Append(kPepperFlashSystemBaseDirectory);
 #elif defined(OS_MACOSX)
-      // TODO(luken): finalize Mac OS directory paths, current consensus is
-      // around /Library/Internet Plug-Ins/PepperFlashPlayer/
-      return false;
+      if (!GetLocalLibraryDirectory(&cur))
+        return false;
+      cur = cur.Append(kPepperFlashSystemBaseDirectory);
 #else
+      // TODO(wfh): If Adobe release PPAPI binaries for Linux, add support here.
       return false;
 #endif
       break;