Reland 175201 with fixes for installer.

ui/gl/gl_implementation_win.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <vector>
 
 #include "base/at_exit.h"
 #include "base/base_paths.h"
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 97 matching lines @@
 
       InitializeGLBindingsGL();
       InitializeGLBindingsOSMESA();
       break;
     }
     case kGLImplementationEGLGLES2: {
       FilePath module_path;
       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();
       bool using_swift_shader =
           command_line->GetSwitchValueASCII(switches::kUseGL) == "swiftshader";
       if (using_swift_shader) {
         if (!command_line->HasSwitch(switches::kSwiftShaderPath))
           return false;
         gles_path =
             command_line->GetSwitchValuePath(switches::kSwiftShaderPath);
@@ skipping 130 matching lines @@
 void ClearGLBindings() {
   ClearGLBindingsEGL();
   ClearGLBindingsGL();
   ClearGLBindingsOSMESA();
   ClearGLBindingsWGL();
   SetGLImplementation(kGLImplementationNone);
   UnloadGLNativeLibraries();
 }
 
 }  // namespace gfx