Make it possible to disable dbus on linux

content/content_browser.gypi

 # 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.
 
 {
   'dependencies': [
     'browser/speech/proto/speech_proto.gyp:speech_proto',
     '../base/base.gyp:base_static',
     '../crypto/crypto.gyp:crypto',
     '../google_apis/google_apis.gyp:google_apis',
@@ skipping 1062 matching lines @@
       ],
       # Set LINUX_SANDBOX_PATH for Linux, including Chrome OS
       'conditions': [
         ['linux_sandbox_path != ""', {
           'defines': [
             'LINUX_SANDBOX_PATH="<(linux_sandbox_path)"',
           ],
         }],
       ],
     }],
+    ['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',
         '../build/linux/system.gyp:fontconfig',
         '../build/linux/system.gyp:x11',
         '../dbus/dbus.gyp:dbus',
       ],
     }],
     ['OS=="android"', {
       'dependencies': [
@@ skipping 132 matching lines @@
         ['exclude', '^browser/speech/'],
       ],
     }],
     ['linux_use_libgps==1', {
       'dependencies': [
         '../build/linux/system.gyp:libgps',
       ],
     }],
   ],
 }