Reland 175201 with fixes for installer.

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

See also: https://codereview.chromium.org/11747017/

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

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

1 files changed, 1 insertions, 3 deletions

diff --git a/ui/gl/gl_implementation_win.cc b/ui/gl/gl_implementation_win.cc
index ac1e3bf..459598b 100644
--- a/ui/gl/gl_implementation_win.cc
+++ b/ui/gl/gl_implementation_win.cc
@@ -115,14 +115,12 @@ bool InitializeGLBindings(GLImplementation implementation) {
       if (!PathService::Get(base::DIR_MODULE, &module_path))
         return false;
 
-      // Attempt to load D3DX and its dependencies using the default search path
+      // Attempt to load the D3DX shader compiler 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();