summaryrefslogtreecommitdiffstats
path: root/chrome/browser/device_orientation
diff options
context:
space:
mode:
authorhans@chromium.org <hans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-08 19:04:45 +0000
committerhans@chromium.org <hans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-08 19:04:45 +0000
commitc9e4322d0b2088b55ee242c6adf889143fc49aac (patch)
tree4e7d602c96a16cae2c9607711d40ebfa39788d60 /chrome/browser/device_orientation
parentb5cf91c40308ce67d9dc36f31fa2bdb855e317ed (diff)
downloadchromium_src-c9e4322d0b2088b55ee242c6adf889143fc49aac.zip
chromium_src-c9e4322d0b2088b55ee242c6adf889143fc49aac.tar.gz
chromium_src-c9e4322d0b2088b55ee242c6adf889143fc49aac.tar.bz2
Device Orientation: suppress assert about thread join from IO thread.
Temporarily suppress in order to stop breaking other tests. BUG=72286 TEST=see bug Review URL: http://codereview.chromium.org/6452012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74139 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/device_orientation')
-rw-r--r--chrome/browser/device_orientation/provider_impl.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/browser/device_orientation/provider_impl.cc b/chrome/browser/device_orientation/provider_impl.cc
index 330740d..6fe33cf 100644
--- a/chrome/browser/device_orientation/provider_impl.cc
+++ b/chrome/browser/device_orientation/provider_impl.cc
@@ -10,6 +10,7 @@
#include "base/message_loop.h"
#include "base/task.h"
#include "base/threading/thread.h"
+#include "base/threading/thread_restrictions.h"
#include "chrome/browser/device_orientation/orientation.h"
#include "chrome/browser/device_orientation/provider_impl.h"
@@ -58,6 +59,10 @@ void ProviderImpl::Start() {
void ProviderImpl::Stop() {
DCHECK(MessageLoop::current() == creator_loop_);
+
+ // TODO(hans): Don't join the thread. See crbug.com/72286.
+ base::ThreadRestrictions::ScopedAllowIO allow_io;
+
polling_thread_.reset();
data_fetcher_.reset();
}