Revert 175201 due to failures in official build.

> Windows: Remove content's dependency on d3dx9_43.dll.
> 
> ANGLE doesn't need this loaded anymore.
> 
> Review URL: https://chromiumcodereview.appspot.com/11737027

TBR=apatrick@chromium.org
Review URL: https://codereview.chromium.org/11791013

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

content/content_common.gypi

@@ -531,6 +531,7 @@
       'link_settings': {
         'libraries': [
            '-ld3d9.lib',
+           '-ld3dx9.lib',
            '-ldxva2.lib',
            '-lstrmiids.lib',
            '-lmf.lib',
@@ -542,6 +543,7 @@
             'AdditionalLibraryDirectories': ['$(DXSDK_DIR)/lib/x86'],
             'DelayLoadDLLs': [
               'd3d9.dll',
+              'd3dx9_43.dll',
               'dxva2.dll',
               'mf.dll',
               'mfplat.dll',

content/content_gpu.gypi

@@ -47,6 +47,26 @@
     }],
     ['OS=="win" and directxsdk_exists=="True"', {
       'actions': [
+        {
+          'action_name': 'extract_d3dx9',
+          'variables': {
+            'input': 'Jun2010_d3dx9_43_x86.cab',
+            'output': 'd3dx9_43.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)',
+          ],
+        },
         {
           'action_name': 'extract_d3dcompiler',
           'variables': {

ui/gl/gl_implementation_win.cc

@@ -115,12 +115,14 @@ bool InitializeGLBindings(GLImplementation implementation) {
       if (!PathService::Get(base::DIR_MODULE, &module_path))
         return false;
 
-      // Attempt to load the D3DX shader compiler using the default search path
+      // Attempt to load D3DX and its dependencies using the default search path
       // and if that fails, using an absolute path. This is to ensure these DLLs
       // are loaded before ANGLE is loaded in case they are not in the default
       // search path.
       LoadD3DXLibrary(module_path, base::StringPrintf(L"d3dcompiler_%d.dll",
                                                       kPinnedD3DXVersion));
+      LoadD3DXLibrary(module_path, base::StringPrintf(L"d3dx9_%d.dll",
+                                                      kPinnedD3DXVersion));
 
       FilePath gles_path;
       const CommandLine* command_line = CommandLine::ForCurrentProcess();