Moving SwiftShader from component to bundled library

ui/gl/init/gl_initializer_win.cc

Index: ui/gl/init/gl_initializer_win.cc
diff --git a/ui/gl/init/gl_initializer_win.cc b/ui/gl/init/gl_initializer_win.cc
index c8648a761c74c8ef097a58414c79008466d00176..7479084451e9943f1754496cbbc25c4d7eaf9aa3 100644
--- a/ui/gl/init/gl_initializer_win.cc
+++ b/ui/gl/init/gl_initializer_win.cc
@@ -104,9 +104,10 @@ bool InitializeStaticEGLInternal() {
       (use_gl == kGLImplementationSwiftShaderName) ||
       (use_gl == kGLImplementationSwiftShaderForWebGLName);
   if (using_swift_shader) {
-    if (!command_line->HasSwitch(switches::kSwiftShaderPath))
-      return false;
-    gles_path = command_line->GetSwitchValuePath(switches::kSwiftShaderPath);
+#if !BUILDFLAG(ENABLE_SWIFTSHADER)
+    return false;
+#endif
+    gles_path = module_path.Append(L"swiftshader/");

[grt (UTC plus 2), 2017/02/27 09:31:56]

nit: put these next three lines within #else/#endif so that you don't get a
warning/error from the compiler about unreachable code when !SS

[sugoi, 2017/02/28 16:45:10]

Done. Also did a similar fix in the x11 path.

     // Preload library
     LoadLibrary(L"ddraw.dll");
   } else {
@@ -133,7 +134,9 @@ bool InitializeStaticEGLInternal() {
     return false;
   }
 
-#if BUILDFLAG(ENABLE_SWIFTSHADER)
+  // Note: This is no longer required by SwiftShader, but we will keep this
+  //       registration code for the time being in case someone attemps to
+  //       use a legacy version of SwiftShader with Chromium.
   if (using_swift_shader) {
     // Register key so that SwiftShader doesn't display watermark logo.
     typedef void (__stdcall *RegisterFunc)(const char* key);
@@ -143,7 +146,6 @@ bool InitializeStaticEGLInternal() {
       reg("SS3GCKK6B448CF63");
     }
   }
-#endif
 
   GLGetProcAddressProc get_proc_address =
       reinterpret_cast<GLGetProcAddressProc>(