Revert 112812 - Add xinput1_3.dll redist to final package.

Adds XInput redist DLL which is a new dependency of recently added gamepad code,
and is required on Win XP. laforge has OK'd the size addition to the final
package (~100K).

BUG=79050

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

TBR=scottmg@google.com
Review URL: http://codereview.chromium.org/8788009

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

3 files changed, 60 insertions, 91 deletions

diff --git a/chrome/installer/mini_installer/chrome.release b/chrome/installer/mini_installer/chrome.release
index 9aede42..d8035b0 100644
--- a/chrome/installer/mini_installer/chrome.release
+++ b/chrome/installer/mini_installer/chrome.release
@@ -1,61 +1,60 @@
-# Copyright 2010, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#    * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#    * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-[GENERAL]
-chrome.exe: %(ChromeDir)s\
-wow_helper.exe: %(ChromeDir)s\
-Dictionaries\en-US.bdic: %(ChromeDir)s\Dictionaries
-chrome.dll: %(VersionDir)s\
-nacl64.exe: %(VersionDir)s\
-ppGoogleNaClPluginChrome.dll: %(VersionDir)s\
-nacl_irt_x86_32.nexe: %(VersionDir)s\
-nacl_irt_x86_64.nexe: %(VersionDir)s\
-icudt.dll: %(VersionDir)s\
-resources.pak: %(VersionDir)s\
-locales\*.pak: %(VersionDir)s\Locales
-locales\*.dll: %(VersionDir)s\Locales
-npchrome_frame.dll: %(VersionDir)s\
-chrome_launcher.exe: %(VersionDir)s\
-chrome_frame_helper.exe: %(VersionDir)s\
-chrome_frame_helper.dll: %(VersionDir)s\
-Extensions\*.*: %(VersionDir)s\Extensions\
-av*.dll: %(VersionDir)s\
-pdf.dll: %(VersionDir)s\
-d3dx9_43.dll: %(VersionDir)s\
-D3DCompiler_43.dll: %(VersionDir)s\
-libEGL.dll: %(VersionDir)s\
-libGLESv2.dll: %(VersionDir)s\
-xinput1_3.dll: %(VersionDir)s\
-default_apps\*.crx: %(VersionDir)s\default_apps\
-default_apps\external_extensions.json: %(VersionDir)s\default_apps\
-
-[GOOGLE_CHROME]
-gcswf32.dll: %(VersionDir)s\
-plugin.vch: %(VersionDir)s\
-FlashPlayerCPLApp.cpl: %(VersionDir)s\
+# Copyright 2010, Google Inc.

+# All rights reserved.

+#

+# Redistribution and use in source and binary forms, with or without

+# modification, are permitted provided that the following conditions are

+# met:

+#

+#    * Redistributions of source code must retain the above copyright

+# notice, this list of conditions and the following disclaimer.

+#    * Redistributions in binary form must reproduce the above

+# copyright notice, this list of conditions and the following disclaimer

+# in the documentation and/or other materials provided with the

+# distribution.

+#    * Neither the name of Google Inc. nor the names of its

+# contributors may be used to endorse or promote products derived from

+# this software without specific prior written permission.

+#

+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+

+[GENERAL]

+chrome.exe: %(ChromeDir)s\

+wow_helper.exe: %(ChromeDir)s\

+Dictionaries\en-US.bdic: %(ChromeDir)s\Dictionaries

+chrome.dll: %(VersionDir)s\

+nacl64.exe: %(VersionDir)s\

+ppGoogleNaClPluginChrome.dll: %(VersionDir)s\

+nacl_irt_x86_32.nexe: %(VersionDir)s\

+nacl_irt_x86_64.nexe: %(VersionDir)s\

+icudt.dll: %(VersionDir)s\

+resources.pak: %(VersionDir)s\

+locales\*.pak: %(VersionDir)s\Locales

+locales\*.dll: %(VersionDir)s\Locales

+npchrome_frame.dll: %(VersionDir)s\

+chrome_launcher.exe: %(VersionDir)s\

+chrome_frame_helper.exe: %(VersionDir)s\

+chrome_frame_helper.dll: %(VersionDir)s\

+Extensions\*.*: %(VersionDir)s\Extensions\

+av*.dll: %(VersionDir)s\

+pdf.dll: %(VersionDir)s\

+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\

+default_apps\external_extensions.json: %(VersionDir)s\default_apps\

+

+[GOOGLE_CHROME]

+gcswf32.dll: %(VersionDir)s\

+plugin.vch: %(VersionDir)s\

+FlashPlayerCPLApp.cpl: %(VersionDir)s\

diff --git a/chrome/tools/build/win/FILES.cfg b/chrome/tools/build/win/FILES.cfg
index 45873e0..540ad69 100644
--- a/chrome/tools/build/win/FILES.cfg
+++ b/chrome/tools/build/win/FILES.cfg
@@ -363,12 +363,6 @@ FILES = [
     'arch': ['32bit', '64bit'],
     'buildtype': ['dev', 'official'],
   },
-  # XInput files:
-  {
-    'filename': 'xinput1_3.dll',
-    'arch': ['32bit', '64bit'],
-    'buildtype': ['dev', 'official'],
-  },
   # Native Client plugin files:
   {
     'filename': 'ppGoogleNaClPluginChrome.dll',
diff --git a/content/content_common.gypi b/content/content_common.gypi
index c09e00d..a9bdb55 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -323,29 +323,5 @@
         ],
       },
     }],
-    ['OS=="win" and directxsdk_exists=="True"', {
-      'actions': [
-      {
-        'action_name': 'extract_xinput',
-        'variables': {
-          'input': 'APR2007_xinput_x86.cab',
-          'output': 'xinput1_3.dll',
-        },
-        'inputs': [
-          '../third_party/directxsdk/files/Redist/<(input)',
-        ],
-        'outputs': [
-          '<(PRODUCT_DIR)/<(output)',
-        ],
-        'action': [
-          'python',
-        '../build/extract_from_cab.py',
-        '..\\third_party\\directxsdk\\files\\Redist\\<(input)',
-        '<(output)',
-        '<(PRODUCT_DIR)',
-        ],
-      },
-     ]
-    }]
   ],
 }