Revert 171544

ui/gl/gl_implementation_mac.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 "base/base_paths.h"
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/mac/foundation_util.h"
 #include "base/native_library.h"
 #include "base/path_service.h"
@@ skipping 31 matching lines @@
   switch (implementation) {
     case kGLImplementationOSMesaGL: {
       // osmesa.so is located in the build directory. This code path is only
       // valid in a developer build environment.
       FilePath exe_path;
       if (!PathService::Get(base::FILE_EXE, &exe_path)) {
         LOG(ERROR) << "PathService::Get failed.";
         return false;
       }
       FilePath bundle_path = base::mac::GetAppBundlePath(exe_path);
-      // Some unit test targets depend on osmesa but aren't built as app
-      // bundles. In that case, the .so is next to the executable.
-      if (bundle_path.empty())
-        bundle_path = exe_path;
       FilePath build_dir_path = bundle_path.DirName();
       FilePath osmesa_path = build_dir_path.Append("osmesa.so");
 
       // When using OSMesa, just use OSMesaGetProcAddress to find entry points.
       base::NativeLibrary library = base::LoadNativeLibrary(osmesa_path, NULL);
       if (!library) {
         LOG(ERROR) << "osmesa.so not found at " << osmesa_path.value();
         return false;
       }
 
@@ skipping 71 matching lines @@
 
 void ClearGLBindings() {
   ClearGLBindingsGL();
   ClearGLBindingsOSMESA();
   SetGLImplementation(kGLImplementationNone);
 
   UnloadGLNativeLibraries();
 }
 
 }  // namespace gfx