Index: content/browser/gamepad/gamepad_provider.cc |
diff --git a/content/browser/gamepad/gamepad_provider.cc b/content/browser/gamepad/gamepad_provider.cc |
index 642e2445a7bbe8fa0d0fc8fa7fd1fcbe2827c101..d8e8df88a7bdcf6a7fdeb026889721003cf9f77a 100644 |
--- a/content/browser/gamepad/gamepad_provider.cc |
+++ b/content/browser/gamepad/gamepad_provider.cc |
@@ -23,8 +23,6 @@ |
namespace gamepad { |
-Provider* Provider::instance_ = NULL; |
- |
using namespace content; |
// Define the default data fetcher that Provider will use if none is supplied. |
@@ -99,6 +97,9 @@ void Provider::Start() { |
void Provider::Stop() { |
DCHECK(MessageLoop::current()->message_loop_proxy() == creator_loop_); |
+ // TODO(scottmg): Don't join the thread. See crbug.com/72286. |
+ base::ThreadRestrictions::ScopedAllowIO allow_io; |
jam
2011/11/24 23:16:02
hmm, no way to avoid this in this cl? these usage
|
+ |
polling_thread_.reset(); |
data_fetcher_.reset(); |
} |