Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(526)

Side by Side Diff: content/browser/dom_storage/dom_storage_context_wrapper.cc

Issue 1159623009: content: Remove use of MessageLoopProxy and deprecated MessageLoop APIs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Test build fix. Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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/dom_storage/dom_storage_context_wrapper.h" 5 #include "content/browser/dom_storage/dom_storage_context_wrapper.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/bind_helpers.h" 11 #include "base/bind_helpers.h"
12 #include "base/files/file_path.h" 12 #include "base/files/file_path.h"
13 #include "base/message_loop/message_loop_proxy.h" 13 #include "base/location.h"
14 #include "base/single_thread_task_runner.h"
15 #include "base/thread_task_runner_handle.h"
14 #include "content/browser/dom_storage/dom_storage_area.h" 16 #include "content/browser/dom_storage/dom_storage_area.h"
15 #include "content/browser/dom_storage/dom_storage_context_impl.h" 17 #include "content/browser/dom_storage/dom_storage_context_impl.h"
16 #include "content/browser/dom_storage/dom_storage_task_runner.h" 18 #include "content/browser/dom_storage/dom_storage_task_runner.h"
17 #include "content/browser/dom_storage/session_storage_namespace_impl.h" 19 #include "content/browser/dom_storage/session_storage_namespace_impl.h"
18 #include "content/public/browser/browser_thread.h" 20 #include "content/public/browser/browser_thread.h"
19 #include "content/public/browser/local_storage_usage_info.h" 21 #include "content/public/browser/local_storage_usage_info.h"
20 #include "content/public/browser/session_storage_usage_info.h" 22 #include "content/public/browser/session_storage_usage_info.h"
21 23
22 namespace content { 24 namespace content {
23 namespace { 25 namespace {
24 26
25 const char kLocalStorageDirectory[] = "Local Storage"; 27 const char kLocalStorageDirectory[] = "Local Storage";
26 const char kSessionStorageDirectory[] = "Session Storage"; 28 const char kSessionStorageDirectory[] = "Session Storage";
27 29
28 void InvokeLocalStorageUsageCallbackHelper( 30 void InvokeLocalStorageUsageCallbackHelper(
29 const DOMStorageContext::GetLocalStorageUsageCallback& callback, 31 const DOMStorageContext::GetLocalStorageUsageCallback& callback,
30 const std::vector<LocalStorageUsageInfo>* infos) { 32 const std::vector<LocalStorageUsageInfo>* infos) {
31 callback.Run(*infos); 33 callback.Run(*infos);
32 } 34 }
33 35
34 void GetLocalStorageUsageHelper( 36 void GetLocalStorageUsageHelper(
35 base::MessageLoopProxy* reply_loop, 37 base::SingleThreadTaskRunner* reply_task_runner,
36 DOMStorageContextImpl* context, 38 DOMStorageContextImpl* context,
37 const DOMStorageContext::GetLocalStorageUsageCallback& callback) { 39 const DOMStorageContext::GetLocalStorageUsageCallback& callback) {
38 std::vector<LocalStorageUsageInfo>* infos = 40 std::vector<LocalStorageUsageInfo>* infos =
39 new std::vector<LocalStorageUsageInfo>; 41 new std::vector<LocalStorageUsageInfo>;
40 context->GetLocalStorageUsage(infos, true); 42 context->GetLocalStorageUsage(infos, true);
41 reply_loop->PostTask( 43 reply_task_runner->PostTask(
42 FROM_HERE, 44 FROM_HERE, base::Bind(&InvokeLocalStorageUsageCallbackHelper, callback,
43 base::Bind(&InvokeLocalStorageUsageCallbackHelper, 45 base::Owned(infos)));
44 callback, base::Owned(infos)));
45 } 46 }
46 47
47 void InvokeSessionStorageUsageCallbackHelper( 48 void InvokeSessionStorageUsageCallbackHelper(
48 const DOMStorageContext::GetSessionStorageUsageCallback& callback, 49 const DOMStorageContext::GetSessionStorageUsageCallback& callback,
49 const std::vector<SessionStorageUsageInfo>* infos) { 50 const std::vector<SessionStorageUsageInfo>* infos) {
50 callback.Run(*infos); 51 callback.Run(*infos);
51 } 52 }
52 53
53 void GetSessionStorageUsageHelper( 54 void GetSessionStorageUsageHelper(
54 base::MessageLoopProxy* reply_loop, 55 base::SingleThreadTaskRunner* reply_task_runner,
55 DOMStorageContextImpl* context, 56 DOMStorageContextImpl* context,
56 const DOMStorageContext::GetSessionStorageUsageCallback& callback) { 57 const DOMStorageContext::GetSessionStorageUsageCallback& callback) {
57 std::vector<SessionStorageUsageInfo>* infos = 58 std::vector<SessionStorageUsageInfo>* infos =
58 new std::vector<SessionStorageUsageInfo>; 59 new std::vector<SessionStorageUsageInfo>;
59 context->GetSessionStorageUsage(infos); 60 context->GetSessionStorageUsage(infos);
60 reply_loop->PostTask( 61 reply_task_runner->PostTask(
61 FROM_HERE, 62 FROM_HERE, base::Bind(&InvokeSessionStorageUsageCallbackHelper, callback,
62 base::Bind(&InvokeSessionStorageUsageCallbackHelper, 63 base::Owned(infos)));
63 callback, base::Owned(infos)));
64 } 64 }
65 65
66 } // namespace 66 } // namespace
67 67
68 DOMStorageContextWrapper::DOMStorageContextWrapper( 68 DOMStorageContextWrapper::DOMStorageContextWrapper(
69 const base::FilePath& data_path, 69 const base::FilePath& data_path,
70 storage::SpecialStoragePolicy* special_storage_policy) { 70 storage::SpecialStoragePolicy* special_storage_policy) {
71 base::SequencedWorkerPool* worker_pool = BrowserThread::GetBlockingPool(); 71 base::SequencedWorkerPool* worker_pool = BrowserThread::GetBlockingPool();
72 context_ = new DOMStorageContextImpl( 72 context_ = new DOMStorageContextImpl(
73 data_path.empty() ? data_path 73 data_path.empty() ? data_path
74 : data_path.AppendASCII(kLocalStorageDirectory), 74 : data_path.AppendASCII(kLocalStorageDirectory),
75 data_path.empty() ? data_path 75 data_path.empty() ? data_path
76 : data_path.AppendASCII(kSessionStorageDirectory), 76 : data_path.AppendASCII(kSessionStorageDirectory),
77 special_storage_policy, 77 special_storage_policy,
78 new DOMStorageWorkerPoolTaskRunner( 78 new DOMStorageWorkerPoolTaskRunner(
79 worker_pool, 79 worker_pool,
80 worker_pool->GetNamedSequenceToken("dom_storage_primary"), 80 worker_pool->GetNamedSequenceToken("dom_storage_primary"),
81 worker_pool->GetNamedSequenceToken("dom_storage_commit"), 81 worker_pool->GetNamedSequenceToken("dom_storage_commit"),
82 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO) 82 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)
83 .get())); 83 .get()));
84 } 84 }
85 85
86 DOMStorageContextWrapper::~DOMStorageContextWrapper() { 86 DOMStorageContextWrapper::~DOMStorageContextWrapper() {
87 } 87 }
88 88
89 void DOMStorageContextWrapper::GetLocalStorageUsage( 89 void DOMStorageContextWrapper::GetLocalStorageUsage(
90 const GetLocalStorageUsageCallback& callback) { 90 const GetLocalStorageUsageCallback& callback) {
91 DCHECK(context_.get()); 91 DCHECK(context_.get());
92 context_->task_runner() 92 context_->task_runner()->PostShutdownBlockingTask(
93 ->PostShutdownBlockingTask(FROM_HERE, 93 FROM_HERE, DOMStorageTaskRunner::PRIMARY_SEQUENCE,
94 DOMStorageTaskRunner::PRIMARY_SEQUENCE, 94 base::Bind(&GetLocalStorageUsageHelper,
95 base::Bind(&GetLocalStorageUsageHelper, 95 base::ThreadTaskRunnerHandle::Get(), context_, callback));
96 base::MessageLoopProxy::current(),
97 context_,
98 callback));
99 } 96 }
100 97
101 void DOMStorageContextWrapper::GetSessionStorageUsage( 98 void DOMStorageContextWrapper::GetSessionStorageUsage(
102 const GetSessionStorageUsageCallback& callback) { 99 const GetSessionStorageUsageCallback& callback) {
103 DCHECK(context_.get()); 100 DCHECK(context_.get());
104 context_->task_runner() 101 context_->task_runner()->PostShutdownBlockingTask(
105 ->PostShutdownBlockingTask(FROM_HERE, 102 FROM_HERE, DOMStorageTaskRunner::PRIMARY_SEQUENCE,
106 DOMStorageTaskRunner::PRIMARY_SEQUENCE, 103 base::Bind(&GetSessionStorageUsageHelper,
107 base::Bind(&GetSessionStorageUsageHelper, 104 base::ThreadTaskRunnerHandle::Get(), context_, callback));
108 base::MessageLoopProxy::current(),
109 context_,
110 callback));
111 } 105 }
112 106
113 void DOMStorageContextWrapper::DeleteLocalStorage(const GURL& origin) { 107 void DOMStorageContextWrapper::DeleteLocalStorage(const GURL& origin) {
114 DCHECK(context_.get()); 108 DCHECK(context_.get());
115 context_->task_runner()->PostShutdownBlockingTask( 109 context_->task_runner()->PostShutdownBlockingTask(
116 FROM_HERE, 110 FROM_HERE,
117 DOMStorageTaskRunner::PRIMARY_SEQUENCE, 111 DOMStorageTaskRunner::PRIMARY_SEQUENCE,
118 base::Bind(&DOMStorageContextImpl::DeleteLocalStorage, context_, origin)); 112 base::Bind(&DOMStorageContextImpl::DeleteLocalStorage, context_, origin));
119 } 113 }
120 114
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 } 160 }
167 161
168 void DOMStorageContextWrapper::Flush() { 162 void DOMStorageContextWrapper::Flush() {
169 DCHECK(context_.get()); 163 DCHECK(context_.get());
170 context_->task_runner()->PostShutdownBlockingTask( 164 context_->task_runner()->PostShutdownBlockingTask(
171 FROM_HERE, DOMStorageTaskRunner::PRIMARY_SEQUENCE, 165 FROM_HERE, DOMStorageTaskRunner::PRIMARY_SEQUENCE,
172 base::Bind(&DOMStorageContextImpl::Flush, context_)); 166 base::Bind(&DOMStorageContextImpl::Flush, context_));
173 } 167 }
174 168
175 } // namespace content 169 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698