| Index: content/browser/loader/resource_dispatcher_host_impl.cc
|
| diff --git a/content/browser/loader/resource_dispatcher_host_impl.cc b/content/browser/loader/resource_dispatcher_host_impl.cc
|
| index e594cb76d5aef0b6545234d41d7bfa1bb0eee8c1..a5967fcf6795aa8c482e660e7c66671c4c46549e 100644
|
| --- a/content/browser/loader/resource_dispatcher_host_impl.cc
|
| +++ b/content/browser/loader/resource_dispatcher_host_impl.cc
|
| @@ -531,11 +531,6 @@ void LoaderIOThreadNotifier::RenderFrameDeleted(
|
| base::Bind(&ResourceDispatcherHostImpl::OnRenderFrameDeleted));
|
| }
|
|
|
| -// static
|
| -ResourceDispatcherHost* ResourceDispatcherHost::Get() {
|
| - return g_resource_dispatcher_host;
|
| -}
|
| -
|
| ResourceDispatcherHostImpl::ResourceDispatcherHostImpl()
|
| : save_file_manager_(new SaveFileManager()),
|
| request_id_(-1),
|
| @@ -553,7 +548,15 @@ ResourceDispatcherHostImpl::ResourceDispatcherHostImpl()
|
| DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
| DCHECK(!g_resource_dispatcher_host);
|
| g_resource_dispatcher_host = this;
|
| +}
|
|
|
| +ResourceDispatcherHostImpl::~ResourceDispatcherHostImpl() {
|
| + DCHECK(outstanding_requests_stats_map_.empty());
|
| + DCHECK(g_resource_dispatcher_host);
|
| + g_resource_dispatcher_host = NULL;
|
| +}
|
| +
|
| +void ResourceDispatcherHostImpl::Init() {
|
| GetContentClient()->browser()->ResourceDispatcherHostCreated();
|
|
|
| ANNOTATE_BENIGN_RACE(
|
| @@ -579,12 +582,6 @@ ResourceDispatcherHostImpl::ResourceDispatcherHostImpl()
|
| }
|
| }
|
|
|
| -ResourceDispatcherHostImpl::~ResourceDispatcherHostImpl() {
|
| - DCHECK(outstanding_requests_stats_map_.empty());
|
| - DCHECK(g_resource_dispatcher_host);
|
| - g_resource_dispatcher_host = NULL;
|
| -}
|
| -
|
| // static
|
| ResourceDispatcherHostImpl* ResourceDispatcherHostImpl::Get() {
|
| return g_resource_dispatcher_host;
|
|
|