content: Terminate early if the toolkit initialization fails.

content/browser/browser_main_loop.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 "content/browser/browser_main_loop.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/file_util.h"
@@ skipping 97 matching lines @@
 #include "content/browser/zygote_host/zygote_host_impl_linux.h"
 #include "sandbox/linux/suid/client/setuid_sandbox_client.h"
 #endif
 
 #if defined(TCMALLOC_TRACE_MEMORY_SUPPORTED)
 #include "third_party/tcmalloc/chromium/src/gperftools/heap-profiler.h"
 #endif
 
 #if defined(USE_X11)
 #include "ui/gfx/x/x11_connection.h"
+#include "ui/gfx/x/x11_types.h"
 #endif
 
 #if defined(USE_OZONE)
 #include "ui/ozone/ozone_platform.h"
 #include "ui/events/ozone/event_factory_ozone.h"
 #endif
 
 // One of the linux specific headers defines this as a macro.
 #ifdef DestroyAll
 #undef DestroyAll
@@ skipping 888 matching lines @@
   }
 
 #if defined(OS_MACOSX)
   ThemeHelperMac::GetInstance();
 #endif
 #endif  // !defined(OS_IOS)
 
   return result_code_;
 }
 
-void BrowserMainLoop::InitializeToolkit() {
+bool BrowserMainLoop::InitializeToolkit() {
   TRACE_EVENT0("startup", "BrowserMainLoop::InitializeToolkit")
   // TODO(evan): this function is rather subtle, due to the variety
   // of intersecting ifdefs we have.  To keep it easy to follow, there
   // are no #else branches on any #ifs.
   // TODO(stevenjb): Move platform specific code into platform specific Parts
   // (Need to add InitializeToolkit stage to BrowserParts).
   // See also GTK setup in EarlyInitialization, above, and associated comments.
 
 #if defined(TOOLKIT_GTK)
   // It is important for this to happen before the first run dialog, as it
   // styles the dialog as well.
   gfx::InitRCStyles();
 #endif
 
 #if defined(OS_WIN)
   // Init common control sex.
   INITCOMMONCONTROLSEX config;
   config.dwSize = sizeof(config);
   config.dwICC = ICC_WIN95_CLASSES;
   if (!InitCommonControlsEx(&config))
     LOG_GETLASTERROR(FATAL);
 #endif
 
 #if defined(USE_AURA)
+
+#if defined(USE_X11)
+  if (!gfx::GetXDisplay())
+    return false;
+#endif
+
   // Env creates the compositor. Aura widgets need the compositor to be created
   // before they can be initialized by the browser.
   aura::Env::CreateInstance();
-#endif
+#endif  // defined(USE_AURA)
 
   if (parts_)
     parts_->ToolkitInitialized();
+
+  return true;
 }
 
 void BrowserMainLoop::MainMessageLoopRun() {
 #if defined(OS_ANDROID)
   // Android's main message loop is the Java message loop.
   NOTREACHED();
 #else
   DCHECK(base::MessageLoopForUI::IsCurrent());
   if (parameters_.ui_task)
     base::MessageLoopForUI::current()->PostTask(FROM_HERE,
@@ skipping 40 matching lines @@
       base::TimeDelta::FromSeconds(delay_secs));
 }
 
 void BrowserMainLoop::EndStartupTracing(const base::FilePath& trace_file) {
   is_tracing_startup_ = false;
   TracingController::GetInstance()->DisableRecording(
       trace_file, base::Bind(&OnStoppedStartupTracing));
 }
 
 }  // namespace content