Make it possible to disable dbus on linux

content/content_browser.gypi

Index: content/content_browser.gypi
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index 4032dda06d28d339d6f41fc0efb143be572efc22..5b7dcf94e7f08c0313e951eb46f22e0bcd13c0f2 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -1080,6 +1080,25 @@
         }],
       ],
     }],
+    ['OS=="linux" and use_dbus==0', {
+      'sources!': [
+        'browser/power_save_blocker_linux.cc',
+        'browser/geolocation/wifi_data_provider_linux.cc',
+      ],
+      'sources': [
+        'browser/power_save_blocker_empty.cc',

[joth, 2013/03/03 19:43:55]

convention is to list all sources up top of file (so put this around line 590)
and then down here only define rules to _remove_ unneeded things from
configurations

[Mostyn Bramley-Moore, 2013/03/03 21:19:35]

Fixed in the latest patchset.

+      ],
+      'dependencies!': [
+        '../build/linux/system.gyp:dbus',
+        '../dbus/dbus.gyp:dbus',
+      ],
+    }],
+    ['OS!="win" and OS!="mac" and (OS!="linux" or use_dbus==1)', {

[joth, 2013/03/03 19:43:55]

this seems backward. don't we want to remove the null provider in all the cases
where we have a real one? i.e.
OS=="win" or OS==mac or (OS=="linux" and use_dbus==1)

[Mostyn Bramley-Moore, 2013/03/03 21:19:35]

Whoops- right you are.  Fixed in the latest patchset.

+      'sources!': [
+        'browser/geolocation/empty_device_data_provider.cc',
+        'browser/geolocation/empty_device_data_provider.h',
+      ],
+    }],
     ['OS=="linux" and use_aura==1', {
       'dependencies': [
         '../build/linux/system.gyp:dbus',