Upgraded Mesa to 7.9 from 7.7 in order to pick up bug fixes to the...

chrome/gpu/gpu_main.cc

 // Copyright (c) 2010 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 "app/app_switches.h"
 #include "app/gfx/gl/gl_implementation.h"
 #include "base/message_loop.h"
 #include "build/build_config.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/main_function_params.h"
 #include "chrome/gpu/gpu_config.h"
 #include "chrome/gpu/gpu_process.h"
 #include "chrome/gpu/gpu_thread.h"
 
@@ skipping 44 matching lines @@
   if (command_line.HasSwitch(switches::kGpuStartupDialog)) {
     ChildProcess::WaitForDebugger(L"Gpu");
   }
 
   MessageLoop main_message_loop(MessageLoop::TYPE_UI);
   PlatformThread::SetName("CrGpuMain");
 
 #if defined(OS_WIN)
   win_util::ScopedCOMInitializer com_initializer;
 #elif defined(GPU_USE_GLX)
-  gfx::InitializeGLBindings(gfx::kGLImplementationDesktopGL);
+  if (!command_line.HasSwitch(switches::kUseGL)) {
+    gfx::InitializeGLBindings(gfx::kGLImplementationDesktopGL);
+  }
 #endif
 
   GpuProcess gpu_process;
   gpu_process.set_main_thread(new GpuThread());
 
 #if defined(USE_X11)
   SetGpuX11ErrorHandlers();
 #endif
 
   main_message_loop.Run();
 
   return 0;
 }