Make DBUS an optional dependency so Chromium can be built without it....

content/browser/geolocation/wifi_data_provider_linux.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.
 
 // Provides wifi scan API binding for suitable for typical linux distributions.
 // Currently, only the NetworkManager API is used, accessed via D-Bus (in turn
 // accessed via the GLib wrapper).
 
 #include "content/browser/geolocation/wifi_data_provider_linux.h"
 
@@ skipping 14 matching lines @@
 const int kTwoNoChangePollingIntervalMilliseconds = 10 * 60 * 1000;  // 10 mins
 const int kNoWifiPollingIntervalMilliseconds = 20 * 1000; // 20s
 
 const char kNetworkManagerServiceName[] = "org.freedesktop.NetworkManager";
 const char kNetworkManagerPath[] = "/org/freedesktop/NetworkManager";
 const char kNetworkManagerInterface[] = "org.freedesktop.NetworkManager";
 
 // From http://projects.gnome.org/NetworkManager/developers/spec.html
 enum { NM_DEVICE_TYPE_WIFI = 2 };
 
+#if defined(USE_DBUS)
 // Function type matching dbus_g_bus_get_private so that we can
 // dynamically determine the presence of this symbol (see
 // NetworkManagerWlanApi::Init)
 typedef DBusGConnection* DBusGBusGetPrivateFunc(
     DBusBusType type, GMainContext* context, GError** error);
 
 // Utility wrappers to make various GLib & DBus structs into scoped objects.
 class ScopedGPtrArrayFree {
  public:
   void operator()(GPtrArray* x) const {
@@ skipping 344 matching lines @@
                     G_TYPE_INVALID);
   if (CheckError())
     return false;
   if (!G_VALUE_HOLDS(value_out, expected_gvalue_type)) {
     DLOG(WARNING) << "Property " << property_name << " unexptected type "
                   << G_VALUE_TYPE(value_out);
     return false;
   }
   return true;
 }
+#endif

[Paweł Hajdan Jr., 2011/03/08 21:13:13]

nit: Add // defined(USE_DBUS)

There should be two spaces between #endif and the beginning of the comment.

 
 }  // namespace
 
 // static
 template<>
 WifiDataProviderImplBase* WifiDataProvider::DefaultFactoryFunction() {
   return new WifiDataProviderLinux();
 }
 
 WifiDataProviderLinux::WifiDataProviderLinux() {
 }
 
 WifiDataProviderLinux::~WifiDataProviderLinux() {
 }
 
 WifiDataProviderCommon::WlanApiInterface*
 WifiDataProviderLinux::NewWlanApi() {
+#if defined(USE_DBUS)
   scoped_ptr<NetworkManagerWlanApi> wlan_api(new NetworkManagerWlanApi);
   if (wlan_api->Init())
     return wlan_api.release();
+#endif
   return NULL;
 }
 
 PollingPolicyInterface* WifiDataProviderLinux::NewPollingPolicy() {
   return new GenericPollingPolicy<kDefaultPollingIntervalMilliseconds,
                                   kNoChangePollingIntervalMilliseconds,
                                   kTwoNoChangePollingIntervalMilliseconds,
                                   kNoWifiPollingIntervalMilliseconds>;
 }