Revert 99440 - Changed Mac, Linux and Win Official Chrome build to drop...

Revert 99440 - Changed Mac, Linux and Win Official Chrome build to drop default app CRXs in the build/installer output.

BUG=94920
TEST=Do an Official build in mac and win. Ensure that after installing the app, you can find the default apps under the install's directory structure. For win, this is under a default_apps directory, for mac, this is under a "Default Apps" directory.
Review URL: http://codereview.chromium.org/7827021

TBR=stevet@chromium.org
Review URL: http://codereview.chromium.org/7795038

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

chrome/chrome.gyp

@@ -1738,24 +1738,6 @@
             ],
           },
         ],
-        'conditions': [
-          ['branding=="Chrome"', {
-            'copies': [
-              {
-                # This location is for the Windows and Linux builds. For
-                # Windows, the chrome.release file ensures that these files are
-                # copied into the installer. Note that we have a separate
-                # section in chrome_dll.gyp to copy these files for Mac, as it
-                # needs to be dropped inside the framework.
-                'destination': '<(PRODUCT_DIR)/default_apps',
-                'files': [
-                  'browser/resources/default_apps/gmail.crx',
-                  'browser/resources/default_apps/youtube.crx',
-                ],
-              },
-            ],
-          }],
-        ],
       }],  # targets
     }],  # OS != "mac"
   ],  # 'conditions'

chrome/chrome_dll.gypi

@@ -590,22 +590,6 @@
                 },
               ],
               'conditions': [
-                ['branding=="Chrome"', {
-                  'copies': [
-                    {
-                      # This location is for the Mac build. Note that the
-                      # copying of these files for Windows and Linux is handled
-                      # in chrome.gyp, as Mac needs to be dropped inside the
-                      # framework.
-                      'destination':
-                          '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Default Apps',
-                      'files': [
-                        'browser/resources/default_apps/gmail.crx',
-                        'browser/resources/default_apps/youtube.crx',
-                      ],
-                    },
-                  ],
-                }],
                 ['mac_breakpad==1', {
                   'variables': {
                     # A real .dSYM is needed for dump_syms to operate on.

chrome/chrome_installer.gypi

@@ -412,8 +412,6 @@
           '<(PRODUCT_DIR)/locales/en-US.pak',
           '<(PRODUCT_DIR)/nacl_helper',
           '<(PRODUCT_DIR)/nacl_helper_bootstrap',
-          '<(PRODUCT_DIR)/default_apps/gmail.crx',
-          '<(PRODUCT_DIR)/default_apps/youtube.crx',
         ],
         'flock_bash': ['flock', '--', '/tmp/linux_package_lock', 'bash'],
         'deb_build': '<(PRODUCT_DIR)/installer/debian/build.sh',

chrome/installer/mini_installer/chrome.release

@@ -52,7 +52,6 @@ d3dx9_43.dll: %(VersionDir)s\
 D3DCompiler_43.dll: %(VersionDir)s\
 libEGL.dll: %(VersionDir)s\
 libGLESv2.dll: %(VersionDir)s\
-default_apps\*.crx: %(VersionDir)s\default_apps\
 
 [GOOGLE_CHROME]
 gcswf32.dll: %(VersionDir)s\