Fix osmesa lib path regression in Linux introduced in r82008.

BUG=none
TEST=a few webgl tests in linux turns green
TBR=evan@chromium.org
Review URL: http://codereview.chromium.org/6873060

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

1 files changed, 9 insertions, 4 deletions

diff --git a/ui/gfx/gl/gl_implementation_linux.cc b/ui/gfx/gl/gl_implementation_linux.cc
index 834bb31..6daa1a5 100644
--- a/ui/gfx/gl/gl_implementation_linux.cc
+++ b/ui/gfx/gl/gl_implementation_linux.cc
@@ -28,17 +28,21 @@ void GL_BINDING_CALL MarshalDepthRangeToDepthRangef(GLclampd z_near,
 }
 
 // Load a library, printing an error message on failure.
-base::NativeLibrary LoadLibrary(const char* filename) {
+base::NativeLibrary LoadLibrary(const FilePath& filename) {
   std::string error;
-  base::NativeLibrary library = base::LoadNativeLibrary(FilePath(filename),
+  base::NativeLibrary library = base::LoadNativeLibrary(filename,
                                                         &error);
   if (!library) {
-    VLOG(1) << "Failed to load " << filename << ": " << error;
+    VLOG(1) << "Failed to load " << filename.MaybeAsASCII() << ": " << error;
     return NULL;
   }
   return library;
 }
 
+base::NativeLibrary LoadLibrary(const char* filename) {
+  return LoadLibrary(FilePath(filename));
+}
+
 }  // namespace anonymous
 
 bool InitializeGLBindings(GLImplementation implementation) {
@@ -56,7 +60,8 @@ bool InitializeGLBindings(GLImplementation implementation) {
         return false;
       }
 
-      base::NativeLibrary library = LoadLibrary("libosmesa.so");
+      base::NativeLibrary library = LoadLibrary(
+          module_path.Append("libosmesa.so"));
       if (!library)
         return false;