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

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

3 files changed, 28 insertions, 21 deletions

diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi
index f892a1f..61465d8 100644
--- a/chrome/chrome_dll.gypi
+++ b/chrome/chrome_dll.gypi
@@ -284,6 +284,10 @@
                 # Bring in pdfsqueeze and run it on all pdfs
                 '../build/temp_gyp/pdfsqueeze.gyp:pdfsqueeze',
                 '../build/util/support/support.gyp:*',
+                # On Mac, Flash gets put into the framework, so we need this
+                # dependency here. flash_player.gyp will copy the Flash bundle
+                # into PRODUCT_DIR.
+                '../third_party/adobe/flash/flash_player.gyp:flash_player',
               ],
               'rules': [
                 {
@@ -461,6 +465,18 @@
                     '<(PRODUCT_DIR)/libffmpegsumo.dylib',
                   ],
                 },
+                {
+                  'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Internet Plug-Ins',
+                  'files': [],
+                  'conditions': [
+                    [ 'branding == "Chrome"', {
+                      'files': [
+                        '<(PRODUCT_DIR)/Flash Player Plugin for Chrome.plugin',
+                        '<(PRODUCT_DIR)/plugin.vch',
+                      ],
+                    }],
+                  ],
+                },
               ],
               'conditions': [
                 ['mac_breakpad==1', {
diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi
index 55185b5..a8a714f 100644
--- a/chrome/chrome_exe.gypi
+++ b/chrome/chrome_exe.gypi
@@ -132,9 +132,6 @@
       },
       'dependencies': [
         'chrome_version_info',
-        # Copy Flash Player files to PRODUCT_DIR if applicable.
-        # Let the .gyp file decide what to do on a per-OS basis.
-        '../third_party/adobe/flash/flash_player.gyp:flash_player',
       ],
       'conditions': [
         ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
@@ -333,14 +330,6 @@
               'files': [
                 '<(PRODUCT_DIR)/<(mac_product_name) Helper.app',
               ],
-              'conditions': [
-                [ 'branding == "Chrome"', {
-                  'files': [
-                    '<(PRODUCT_DIR)/Flash Player Plugin for Chrome.plugin',
-                    '<(PRODUCT_DIR)/plugin.vch',
-                  ],
-                }],
-              ],
             },
           ],
           'postbuilds': [
@@ -415,6 +404,10 @@
           ],
           'dependencies': [
             'packed_extra_resources',
+            # Copy Flash Player files to PRODUCT_DIR if applicable. Let the .gyp
+            # file decide what to do on a per-OS basis; on Mac, internal plugins
+            # go inside the framework, so this dependency is in chrome_dll.gypi.
+            '../third_party/adobe/flash/flash_player.gyp:flash_player',
           ],
         }],
         ['OS=="mac" or OS=="win"', {
diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc
index 5b517a1..95e1be9 100644
--- a/chrome/common/chrome_paths.cc
+++ b/chrome/common/chrome_paths.cc
@@ -34,20 +34,18 @@ const FilePath::CharType kInternalFlashPluginFileName[] =
 
 namespace chrome {
 
-// Gets the path for internal (or bundled) plugins.
+// Gets the path for internal plugins.
 bool GetInternalPluginsDirectory(FilePath* result) {
 #if defined(OS_MACOSX)
-  // 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
-
+  // 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
   // The rest of the world expects plugins in the module directory.
   return PathService::Get(base::DIR_MODULE, result);
+#endif
 }
 
 bool GetGearsPluginPathFromCommandLine(FilePath* path) {