| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/browser/streams/stream_context.h" | 5 #include "content/browser/streams/stream_context.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "content/browser/streams/stream_registry.h" | 8 #include "content/browser/streams/stream_registry.h" |
| 9 #include "content/public/browser/browser_context.h" | 9 #include "content/public/browser/browser_context.h" |
| 10 | 10 |
| (...skipping 23 matching lines...) Expand all Loading... |
| 34 return UserDataAdapter<StreamContext>::Get(context, kStreamContextKeyName); | 34 return UserDataAdapter<StreamContext>::Get(context, kStreamContextKeyName); |
| 35 } | 35 } |
| 36 | 36 |
| 37 void StreamContext::InitializeOnIOThread() { | 37 void StreamContext::InitializeOnIOThread() { |
| 38 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 38 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
| 39 registry_.reset(new StreamRegistry()); | 39 registry_.reset(new StreamRegistry()); |
| 40 } | 40 } |
| 41 | 41 |
| 42 StreamContext::~StreamContext() {} | 42 StreamContext::~StreamContext() {} |
| 43 | 43 |
| 44 void StreamContext::DeleteOnCorrectThread() const { |
| 45 // In many tests, there isn't a valid IO thread. In that case, just delete on |
| 46 // the current thread. |
| 47 // TODO(zork): Remove this custom deleter, and fix the leaks in all the |
| 48 // tests. |
| 49 if (BrowserThread::IsMessageLoopValid(BrowserThread::IO) && |
| 50 !BrowserThread::CurrentlyOn(BrowserThread::IO)) { |
| 51 BrowserThread::DeleteSoon(BrowserThread::IO, FROM_HERE, this); |
| 52 return; |
| 53 } |
| 54 delete this; |
| 55 } |
| 56 |
| 44 } // namespace content | 57 } // namespace content |
| OLD | NEW |