Mac: Undo the change in r44662 to use npo3dautoplugin for the default Mac bundle name and instead return to using "O3D".

TEST=built with default name and with an overridden name, on Mac
BUG=none

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

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

4 files changed, 82 insertions, 20 deletions

diff --git a/o3d/plugin/plugin.gyp b/o3d/plugin/plugin.gyp
index bcc3401..bfab2b0 100644
--- a/o3d/plugin/plugin.gyp
+++ b/o3d/plugin/plugin.gyp
@@ -139,7 +139,17 @@
           {
             'mac_bundle': 1,
             'product_extension': 'plugin',
-            'product_name': '<(plugin_npapi_filename)',
+            'conditions': [
+              ['"<(plugin_npapi_filename)" == "npo3dautoplugin"',
+                {
+                  # The unbranded Mac plugin's name is a special case.
+                  'product_name': 'O3D',
+                },
+                {
+                  'product_name': '<(plugin_npapi_filename)',
+                },
+              ],
+            ],
             'dependencies': [
               '../../breakpad/breakpad.gyp:breakpad',
             ],
@@ -202,7 +212,18 @@
                   'copy_frameworks_path': 'mac/plugin_copy_frameworks.sh',
                 },
                 'postbuild_name': 'Copy Frameworks',
-                'action': ['<(copy_frameworks_path)', '<(plugin_npapi_filename)'],
+                'conditions': [
+                  ['"<(plugin_npapi_filename)" == "npo3dautoplugin"',
+                    {
+                      # The unbranded Mac plugin's name is a special case.
+                      'action': ['<(copy_frameworks_path)', 'O3D'],
+                    },
+                    {
+                      'action': ['<(copy_frameworks_path)',
+                                 '<(plugin_npapi_filename)'],
+                    },
+                  ],
+                ],
               },
               {
                 'postbuild_name': 'Process Resource File',
@@ -217,10 +238,24 @@
               },
               {
                 'postbuild_name': 'Compile Resource File',
-                'action': ['/usr/bin/Rez',
-                  '-o',
-                  '${BUILT_PRODUCTS_DIR}/<(plugin_npapi_filename).plugin/Contents/Resources/<(plugin_npapi_filename).rsrc',
-                  '${BUILT_PRODUCTS_DIR}/O3D.r',
+                'conditions': [
+                  ['"<(plugin_npapi_filename)" == "npo3dautoplugin"',
+                    {
+                      # The unbranded Mac plugin's name is a special case.
+                      'action': ['/usr/bin/Rez',
+                        '-o',
+                        '${BUILT_PRODUCTS_DIR}/O3D.plugin/Contents/Resources/O3D.rsrc',
+                        '${BUILT_PRODUCTS_DIR}/O3D.r',
+                      ],
+                    },
+                    {
+                      'action': ['/usr/bin/Rez',
+                        '-o',
+                        '${BUILT_PRODUCTS_DIR}/<(plugin_npapi_filename).plugin/Contents/Resources/<(plugin_npapi_filename).rsrc',
+                        '${BUILT_PRODUCTS_DIR}/O3D.r',
+                      ],
+                    },
+                  ],
                 ],
               },
             ],
@@ -364,7 +399,17 @@
                 {
                   'mac_bundle': 1,
                   'product_extension': 'plugin',
-                  'product_name': '<(plugin_npapi_filename)',
+                  'conditions': [
+                    ['"<(plugin_npapi_filename)" == "npo3dautoplugin"',
+                      {
+                        # The unbranded Mac plugin's name is a special case.
+                        'product_name': 'O3D',
+                      },
+                      {
+                        'product_name': '<(plugin_npapi_filename)',
+                      },
+                    ],
+                  ],
                   'dependencies': [
                     '../../breakpad/breakpad.gyp:breakpad',
                   ],
@@ -550,14 +595,32 @@
                       'outputs': [
                         '<(SHARED_INTERMEDIATE_DIR)/plugin/Info.plist',
                       ],
-                      'action': ['python',
-                        'version_info.py',
-                        '--set_name=<(plugin_name)',
-                        '--set_version=<(plugin_version)',
-                        '--set_npapi_filename=<(plugin_npapi_filename)',
-                        '--set_npapi_mimetype=<(plugin_npapi_mimetype)',
-                        'mac/Info.plist',
-                        '<(SHARED_INTERMEDIATE_DIR)/plugin/Info.plist',
+                      'conditions': [
+                        ['"<(plugin_npapi_filename)" == "npo3dautoplugin"',
+                          {
+                            # The unbranded Mac plugin's name is a special case.
+                            'action': ['python',
+                              'version_info.py',
+                              '--set_name=<(plugin_name)',
+                              '--set_version=<(plugin_version)',
+                              '--set_npapi_filename=O3D',
+                              '--set_npapi_mimetype=<(plugin_npapi_mimetype)',
+                              'mac/Info.plist',
+                              '<(SHARED_INTERMEDIATE_DIR)/plugin/Info.plist',
+                            ],
+                          },
+                          {
+                            'action': ['python',
+                              'version_info.py',
+                              '--set_name=<(plugin_name)',
+                              '--set_version=<(plugin_version)',
+                              '--set_npapi_filename=<(plugin_npapi_filename)',
+                              '--set_npapi_mimetype=<(plugin_npapi_mimetype)',
+                              'mac/Info.plist',
+                              '<(SHARED_INTERMEDIATE_DIR)/plugin/Info.plist',
+                            ],
+                          },
+                        ],
                       ],
                     },
                   ],
diff --git a/o3d/tests/build.scons b/o3d/tests/build.scons
index 29125c0..7d20e6c 100644
--- a/o3d/tests/build.scons
+++ b/o3d/tests/build.scons
@@ -546,7 +546,7 @@ cleanup_steps = []
 selenium_good_to_go = True
 
 if run_env.Bit('mac'):
-  plugin_path = '$ARTIFACTS_DIR/npo3dautoplugin.plugin'
+  plugin_path = '$ARTIFACTS_DIR/O3D.plugin'
 
   if run_env['MAC_HERMETIC_FIREFOX_DIR']:
     # if we have a hermetic version of Firefox, then run it
diff --git a/o3d/tests/lab/runner_constants.py b/o3d/tests/lab/runner_constants.py
index ff6a09e..33afbe5 100644
--- a/o3d/tests/lab/runner_constants.py
+++ b/o3d/tests/lab/runner_constants.py
@@ -92,7 +92,7 @@ if util.IsWindows():
   INSTALL_PATHS += [join(HOME, 'Application Data', 'Google', 'O3D',
                          'o3d_host.dll')]
 elif util.IsMac():
-  INSTALL_PATHS += ['/Library/Internet Plug-Ins/npo3dautoplugin.plugin']
+  INSTALL_PATHS += ['/Library/Internet Plug-Ins/O3D.plugin']
 else:
   INSTALL_PATHS += [join(HOME, '.mozilla', 'plugins',
                          'libnpo3dautoplugin.so')]
diff --git a/o3d/tests/selenium/selenium.gyp b/o3d/tests/selenium/selenium.gyp
index 9820a13..fd5b4e1 100644
--- a/o3d/tests/selenium/selenium.gyp
+++ b/o3d/tests/selenium/selenium.gyp
@@ -16,7 +16,6 @@
   },
   'includes': [
     '../../build/common.gypi',
-    '../../plugin/branding.gypi',
   ],
   'targets': [
     {
@@ -184,7 +183,7 @@
               {
                 'action_name': 'unpack_firefox',
                 'inputs': [
-                  '<(PRODUCT_DIR)/<(plugin_npapi_filename).plugin',
+                  '<(PRODUCT_DIR)/O3D.plugin',
                 ],
                 'outputs': [
                   '<(PRODUCT_DIR)/selenium_firefox',
@@ -192,7 +191,7 @@
                 'action': [
                   'python',
                   'unpack_firefox.py',
-                  '--plugin_path=<(PRODUCT_DIR)/<(plugin_npapi_filename).plugin',
+                  '--plugin_path=<(PRODUCT_DIR)/O3D.plugin',
                   '--product_path=<(PRODUCT_DIR)',
                 ],
               },