OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 <map> | 5 #include <map> |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/file_path.h" | 8 #include "base/file_path.h" |
9 #include "base/message_loop.h" | 9 #include "base/message_loop.h" |
10 #include "base/message_loop_proxy.h" | 10 #include "base/message_loop_proxy.h" |
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
134 | 134 |
135 int64 GetOriginUsage( | 135 int64 GetOriginUsage( |
136 quota::QuotaClient* client, | 136 quota::QuotaClient* client, |
137 const GURL& origin, | 137 const GURL& origin, |
138 quota::StorageType type) { | 138 quota::StorageType type) { |
139 usage_ = 0; | 139 usage_ = 0; |
140 client->GetOriginUsage( | 140 client->GetOriginUsage( |
141 origin, type, | 141 origin, type, |
142 base::Bind(&DatabaseQuotaClientTest::OnGetOriginUsageComplete, | 142 base::Bind(&DatabaseQuotaClientTest::OnGetOriginUsageComplete, |
143 weak_factory_.GetWeakPtr())); | 143 weak_factory_.GetWeakPtr())); |
144 MessageLoop::current()->RunAllPending(); | 144 MessageLoop::current()->RunUntilIdle(); |
145 return usage_; | 145 return usage_; |
146 } | 146 } |
147 | 147 |
148 const std::set<GURL>& GetOriginsForType( | 148 const std::set<GURL>& GetOriginsForType( |
149 quota::QuotaClient* client, | 149 quota::QuotaClient* client, |
150 quota::StorageType type) { | 150 quota::StorageType type) { |
151 origins_.clear(); | 151 origins_.clear(); |
152 client->GetOriginsForType( | 152 client->GetOriginsForType( |
153 type, | 153 type, |
154 base::Bind(&DatabaseQuotaClientTest::OnGetOriginsComplete, | 154 base::Bind(&DatabaseQuotaClientTest::OnGetOriginsComplete, |
155 weak_factory_.GetWeakPtr())); | 155 weak_factory_.GetWeakPtr())); |
156 MessageLoop::current()->RunAllPending(); | 156 MessageLoop::current()->RunUntilIdle(); |
157 return origins_; | 157 return origins_; |
158 } | 158 } |
159 | 159 |
160 const std::set<GURL>& GetOriginsForHost( | 160 const std::set<GURL>& GetOriginsForHost( |
161 quota::QuotaClient* client, | 161 quota::QuotaClient* client, |
162 quota::StorageType type, | 162 quota::StorageType type, |
163 const std::string& host) { | 163 const std::string& host) { |
164 origins_.clear(); | 164 origins_.clear(); |
165 client->GetOriginsForHost( | 165 client->GetOriginsForHost( |
166 type, host, | 166 type, host, |
167 base::Bind(&DatabaseQuotaClientTest::OnGetOriginsComplete, | 167 base::Bind(&DatabaseQuotaClientTest::OnGetOriginsComplete, |
168 weak_factory_.GetWeakPtr())); | 168 weak_factory_.GetWeakPtr())); |
169 MessageLoop::current()->RunAllPending(); | 169 MessageLoop::current()->RunUntilIdle(); |
170 return origins_; | 170 return origins_; |
171 } | 171 } |
172 | 172 |
173 bool DeleteOriginData( | 173 bool DeleteOriginData( |
174 quota::QuotaClient* client, | 174 quota::QuotaClient* client, |
175 quota::StorageType type, | 175 quota::StorageType type, |
176 const GURL& origin) { | 176 const GURL& origin) { |
177 delete_status_ = quota::kQuotaStatusUnknown; | 177 delete_status_ = quota::kQuotaStatusUnknown; |
178 client->DeleteOriginData( | 178 client->DeleteOriginData( |
179 origin, type, | 179 origin, type, |
180 base::Bind(&DatabaseQuotaClientTest::OnDeleteOriginDataComplete, | 180 base::Bind(&DatabaseQuotaClientTest::OnDeleteOriginDataComplete, |
181 weak_factory_.GetWeakPtr())); | 181 weak_factory_.GetWeakPtr())); |
182 MessageLoop::current()->RunAllPending(); | 182 MessageLoop::current()->RunUntilIdle(); |
183 return delete_status_ == quota::kQuotaStatusOk; | 183 return delete_status_ == quota::kQuotaStatusOk; |
184 } | 184 } |
185 | 185 |
186 MockDatabaseTracker* mock_tracker() { return mock_tracker_.get(); } | 186 MockDatabaseTracker* mock_tracker() { return mock_tracker_.get(); } |
187 | 187 |
188 | 188 |
189 private: | 189 private: |
190 void OnGetOriginUsageComplete(int64 usage) { | 190 void OnGetOriginUsageComplete(int64 usage) { |
191 usage_ = usage; | 191 usage_ = usage; |
192 } | 192 } |
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
282 mock_tracker()->set_async_delete(false); | 282 mock_tracker()->set_async_delete(false); |
283 EXPECT_TRUE(DeleteOriginData(&client, kTemp, kOriginA)); | 283 EXPECT_TRUE(DeleteOriginData(&client, kTemp, kOriginA)); |
284 EXPECT_EQ(1, mock_tracker()->delete_called_count()); | 284 EXPECT_EQ(1, mock_tracker()->delete_called_count()); |
285 | 285 |
286 mock_tracker()->set_async_delete(true); | 286 mock_tracker()->set_async_delete(true); |
287 EXPECT_TRUE(DeleteOriginData(&client, kTemp, kOriginA)); | 287 EXPECT_TRUE(DeleteOriginData(&client, kTemp, kOriginA)); |
288 EXPECT_EQ(2, mock_tracker()->delete_called_count()); | 288 EXPECT_EQ(2, mock_tracker()->delete_called_count()); |
289 } | 289 } |
290 | 290 |
291 } // namespace webkit_database | 291 } // namespace webkit_database |
OLD | NEW |