Do not use bundles for the CDM on Mac.

chrome/common/chrome_paths.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/chrome_paths.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/mac/bundle_locations.h"
 #include "base/path_service.h"
@@ skipping 337 matching lines @@
         return false;
       cur = cur.Append(kO1DPluginFileName);
       break;
     case chrome::FILE_GTALK_PLUGIN:
       if (!PathService::Get(base::DIR_MODULE, &cur))
         return false;
       cur = cur.Append(kGTalkPluginFileName);
       break;
 #endif
 #if defined(WIDEVINE_CDM_AVAILABLE)
     // TODO(xhwang): DIR_WIDEVINE_CDM is used for Win/Mac/Linux and

[xhwang, 2013/05/02 19:39:17]

Can you help me drop "/Linux" in this line? Thanks

[ddorwin, 2013/05/02 20:35:57]

Done.

     // FILE_WIDEVINE_CDM_PLUGIN is used for ChromeOS. Unify them!
     case chrome::DIR_WIDEVINE_CDM:
       if (!GetInternalPluginsDirectory(&cur))
         return false;
       cur = cur.Append(kWidevineCdmBaseDirectory);
       break;
     case chrome::FILE_WIDEVINE_CDM_PLUGIN:
+#if defined(OS_MACOSX)
+      // This is only for testing. The production path uses DIR_WIDEVINE_CDM.
+      // Find the adapter (and CDM) in the directory where it gets built.
+      // Use DIR_MODULE because it is consistent in both browser and renderers.
+      if (!PathService::Get(base::DIR_MODULE, &cur))
+        return false;
+      if (base::mac::AmIBundled()) {
+        // If we're called from chrome, it's beside the app (outside the
+        // app bundle), if we're called from a unittest, we'll already be
+        // outside the bundle so use the exe dir.
+        // DIR_MODULE gave us .../

[xhwang, 2013/05/02 19:39:17]

what's .../ ?

[ddorwin, 2013/05/02 20:35:57]

Done.

+        // Chromium.app/Contents/Versions/<v>/Google Chrome Framework.framework.
+        cur = cur.DirName();
+        cur = cur.DirName();
+        cur = cur.DirName();
+        cur = cur.DirName();
+        cur = cur.DirName();

[xhwang, 2013/05/02 19:39:17]

why call this 5 times?

[ddorwin, 2013/05/02 20:35:57]

Each one returns the parent directory I guess. The result is the equivalent of
evaluating "../". I copied this from the pnacl code in this file.

+      }
+#else
       if (!GetInternalPluginsDirectory(&cur))
         return false;
+#endif
       cur = cur.Append(kWidevineCdmPluginFileName);
       break;
 #endif
     case chrome::FILE_RESOURCES_PACK:
 #if defined(OS_MACOSX) && !defined(OS_IOS)
       if (base::mac::AmIBundled()) {
         cur = base::mac::FrameworkBundlePath();
         cur = cur.Append(FILE_PATH_LITERAL("Resources"))
                  .Append(FILE_PATH_LITERAL("resources.pak"));
         break;
@@ skipping 146 matching lines @@
   return true;
 }
 
 // This cannot be done as a static initializer sadly since Visual Studio will
 // eliminate this object file if there is no direct entry point into it.
 void RegisterPathProvider() {
   PathService::RegisterProvider(PathProvider, PATH_START, PATH_END);
 }
 
 }  // namespace chrome