Linux: use our spiffy new DBus client library for KWallet, instead of dbus-glib.

content/browser/browser_main.cc

 // Copyright (c) 2011 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.h"
 
 #include "base/allocator/allocator_shim.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
@@ skipping 19 matching lines @@
 #include <commctrl.h>
 #include <ole2.h>
 #include <shellapi.h>
 
 #include "base/win/scoped_com_initializer.h"
 #include "net/base/winsock_init.h"
 #include "sandbox/src/sandbox.h"
 #include "ui/base/l10n/l10n_util_win.h"
 #endif
 
+#if defined(OS_CHROMEOS)
+#include <dbus/dbus-glib.h>
+#endif
+
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
-#include <dbus/dbus-glib.h>
 #include <sys/stat.h>
 
 #include "content/browser/renderer_host/render_sandbox_host_linux.h"
 #include "content/browser/zygote_host_linux.h"
 #endif
 
 #if defined(TOOLKIT_USES_GTK)
 #include "ui/gfx/gtk_util.h"
 #endif
 
@@ skipping 225 matching lines @@
   // check is actually equivalent and sufficient to work around the
   // error.
   if (!g_thread_supported())
     g_thread_init(NULL);
   // Glib type system initialization. Needed at least for gconf,
   // used in net/proxy/proxy_config_service_linux.cc. Most likely
   // this is superfluous as gtk_init() ought to do this. It's
   // definitely harmless, so retained as a reminder of this
   // requirement for gconf.
   g_type_init();
-  // We use glib-dbus for geolocation and it's possible other libraries
-  // (e.g. gnome-keyring) will use it, so initialize its threading here
-  // as well.
+#if defined(OS_CHROMEOS)
+  // ChromeOS still uses dbus-glib, so initialize its threading here.
+  // TODO(satorux, stevenjb): remove this once it is no longer needed.
   dbus_g_thread_init();
+#endif
   gfx::GtkInitFromCommandLine(parameters().command_line_);
   SetUpGLibLogHandler();
 #endif
 
 #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
 
@@ skipping 99 matching lines @@
 #endif  // OS_WIN
 
   // Initialize histogram statistics gathering system.
   base::StatisticsRecorder statistics;
 
   parts->RunMainMessageLoopParts();
 
   TRACE_EVENT_END_ETW("BrowserMain", 0, 0);
   return parts->result_code();
 }