Revert 49738 [problems running tests] - On Mac, move internal plugins to live inside the framework ...

... in particular in a subdirectory called "Internet Plug-Ins".

BUG=46400
TEST=builds okay everywhere (including branded builds); internal Flash still okay everywhere on branded builds; on Mac, Flash files end up in above-indicated directory

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

TBR=viettrungluu@chromium.org
Review URL: http://codereview.chromium.org/2857001

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

1 files changed, 10 insertions, 8 deletions

diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc
index 95e1be9..5b517a1 100644
--- a/chrome/common/chrome_paths.cc
+++ b/chrome/common/chrome_paths.cc
@@ -34,18 +34,20 @@ const FilePath::CharType kInternalFlashPluginFileName[] =
 
 namespace chrome {
 
-// Gets the path for internal plugins.
+// Gets the path for internal (or bundled) plugins.
 bool GetInternalPluginsDirectory(FilePath* result) {
 #if defined(OS_MACOSX)
-  // On Mac, internal plugins reside in subdirectory of the framework.
-  *result = chrome::GetFrameworkBundlePath();
-  DCHECK(!result->empty());
-  *result = result->Append("Internet Plug-Ins");
-  return true;
-#else
+  // If called from Chrome, get internal plugins from the versioned directory.
+  if (mac_util::AmIBundled()) {
+    *result = chrome::GetVersionedDirectory();
+    DCHECK(!result->empty());
+    return true;
+  }
+  // In tests, just look in the module directory (below).
+#endif
+
   // The rest of the world expects plugins in the module directory.
   return PathService::Get(base::DIR_MODULE, result);
-#endif
 }
 
 bool GetGearsPluginPathFromCommandLine(FilePath* path) {