Fixed regression in order of initialization on Linux in r65461 causing...

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 <stdlib.h>
 
 #include "app/app_switches.h"
 #include "app/gfx/gl/gl_context.h"
 #include "app/gfx/gl/gl_implementation.h"
 #include "base/environment.h"
@@ skipping 72 matching lines @@
   PlatformThread::SetName("CrGpuMain");
 
 #if defined(OS_WIN)
   win_util::ScopedCOMInitializer com_initializer;
 #endif
 
 #if defined(USE_X11)
   SetGpuX11ErrorHandlers();
 #endif
 
+  // On Linux the GpuThread constructor performs certain
+  // initialization that is required before accessing the default X
+  // display.
+  GpuProcess gpu_process;
+  GpuThread* gpu_thread = new GpuThread;
+  gpu_process.set_main_thread(gpu_thread);
+
   // Load the GL implementation and locate the bindings before starting as
   // this can take a lot of time and the GPU watchdog might terminate the GPU
   // process.
   if (!gfx::GLContext::InitializeOneOff())
     return EXIT_FAILURE;
 
-  GpuProcess gpu_process;
-  GpuThread* gpu_thread = new GpuThread;
-  gpu_process.set_main_thread(gpu_thread);
-
   // Only enable this experimental feaure for a subset of users.
   scoped_refptr<base::FieldTrial> watchdog_trial(
       new base::FieldTrial("GpuWatchdogTrial", 100));
   int watchdog_timeout = 0;
   for (int i = kMinGpuTimeout; i <= kMaxGpuTimeout; ++i) {
     int group = watchdog_trial->AppendGroup(StringPrintf("%dsecs", i),
                                             kFieldTrialSize);
     if (group == watchdog_trial->group()) {
       watchdog_timeout = i;
       break;
@@ skipping 36 matching lines @@
   // initialization time is recorded in the GPU info.
   gpu_thread->Init(start_time);
 
   main_message_loop.Run();
 
   if (enable_watchdog)
     watchdog_thread->Stop();
 
   return 0;
 }