diff options
| author | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-01 03:34:20 +0000 |
|---|---|---|
| committer | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-01 03:34:20 +0000 |
| commit | 6b2105244a2bcc5d94ff6055a069364873c69b59 (patch) | |
| tree | 079c209e328d04860c7452d263a7437b7726a2c0 /chrome/browser/chromeos/dbus | |
| parent | 13090c3ff241735f6314d003ac694b52a3e49e01 (diff) | |
| download | chromium_src-6b2105244a2bcc5d94ff6055a069364873c69b59.zip chromium_src-6b2105244a2bcc5d94ff6055a069364873c69b59.tar.gz chromium_src-6b2105244a2bcc5d94ff6055a069364873c69b59.tar.bz2 | |
chromeos: Remove thread DCHECKs in LivenessServiceProvider.
LivenessServiceProvider was doing a
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)) in its
destructor. All threads have been unregistered at the point
where it's destroyed, though. LivenessServiceProvider is
only used by CrosDBusServiceImpl, which already has its own
thread checks, so this change removes
LivenessServiceProvider's checks.
BUG=179083
Review URL: https://chromiumcodereview.appspot.com/12389029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@185442 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/dbus')
| -rw-r--r-- | chrome/browser/chromeos/dbus/liveness_service_provider.cc | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/chrome/browser/chromeos/dbus/liveness_service_provider.cc b/chrome/browser/chromeos/dbus/liveness_service_provider.cc index 9be70e3..fa53212 100644 --- a/chrome/browser/chromeos/dbus/liveness_service_provider.cc +++ b/chrome/browser/chromeos/dbus/liveness_service_provider.cc @@ -5,26 +5,18 @@ #include "chrome/browser/chromeos/dbus/liveness_service_provider.h" #include "base/bind.h" -#include "content/public/browser/browser_thread.h" #include "dbus/bus.h" #include "dbus/message.h" #include "third_party/cros_system_api/dbus/service_constants.h" -using content::BrowserThread; - namespace chromeos { -LivenessServiceProvider::LivenessServiceProvider() : weak_ptr_factory_(this) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); -} +LivenessServiceProvider::LivenessServiceProvider() : weak_ptr_factory_(this) {} -LivenessServiceProvider::~LivenessServiceProvider() { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); -} +LivenessServiceProvider::~LivenessServiceProvider() {} void LivenessServiceProvider::Start( scoped_refptr<dbus::ExportedObject> exported_object) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); exported_object->ExportMethod( kLibCrosServiceInterface, kCheckLiveness, @@ -46,7 +38,6 @@ void LivenessServiceProvider::OnExported(const std::string& interface_name, void LivenessServiceProvider::CheckLiveness( dbus::MethodCall* method_call, dbus::ExportedObject::ResponseSender response_sender) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); response_sender.Run(dbus::Response::FromMethodCall(method_call)); } |