Enable audio/video tag in content_shell

Some media initialization work needed to be added to the shell in order for
the ffmpeg stubs to be loaded and for the media tags to be recognized.

AudioManager also needed to be added to the shell, as the Chromium-equivalent
lives in BrowserProcessImpl, and the media code should not assume the
MediaInternals has been created.

BUG=112043,116906
TEST=content_shell builds and can play the videos in the bug above

Review URL: http://codereview.chromium.org/9316077

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125442 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 11 insertions, 1 deletions

diff --git a/content/common/content_paths.cc b/content/common/content_paths.cc
index 305af33..1c91d9a 100644
--- a/content/common/content_paths.cc
+++ b/content/common/content_paths.cc
@@ -1,10 +1,11 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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 "content/public/common/content_paths.h"
 
 #include "base/file_util.h"
+#include "base/mac/bundle_locations.h"
 #include "base/path_service.h"
 
 namespace content {
@@ -27,6 +28,15 @@ bool PathProvider(int key, FilePath* result) {
       return true;
       break;
     }
+    case DIR_MEDIA_LIBS: {
+#if defined(OS_MACOSX)
+      *result = base::mac::FrameworkBundlePath();
+      *result = result->Append("Libraries");
+      return true;
+#else
+      return PathService::Get(base::DIR_MODULE, result);
+#endif
+    }
     default:
       return false;
   }