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

Side by Side Diff: content/browser/database_quota_client_unittest.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/message_loop/message_loop_proxy.h" 9 #include "base/location.h"
10 #include "base/run_loop.h" 10 #include "base/run_loop.h"
11 #include "base/single_thread_task_runner.h"
11 #include "base/strings/utf_string_conversions.h" 12 #include "base/strings/utf_string_conversions.h"
13 #include "base/thread_task_runner_handle.h"
12 #include "net/base/completion_callback.h" 14 #include "net/base/completion_callback.h"
13 #include "net/base/net_errors.h" 15 #include "net/base/net_errors.h"
14 #include "storage/browser/database/database_quota_client.h" 16 #include "storage/browser/database/database_quota_client.h"
15 #include "storage/browser/database/database_tracker.h" 17 #include "storage/browser/database/database_tracker.h"
16 #include "storage/browser/database/database_util.h" 18 #include "storage/browser/database/database_util.h"
17 #include "storage/common/database/database_identifier.h" 19 #include "storage/common/database/database_identifier.h"
18 #include "testing/gtest/include/gtest/gtest.h" 20 #include "testing/gtest/include/gtest/gtest.h"
19 21
20 using storage::DatabaseQuotaClient; 22 using storage::DatabaseQuotaClient;
21 using storage::DatabaseTracker; 23 using storage::DatabaseTracker;
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 ++iter) { 67 ++iter) {
66 origins_info->push_back(OriginInfo(iter->second)); 68 origins_info->push_back(OriginInfo(iter->second));
67 } 69 }
68 return true; 70 return true;
69 } 71 }
70 72
71 int DeleteDataForOrigin(const std::string& origin_identifier, 73 int DeleteDataForOrigin(const std::string& origin_identifier,
72 const net::CompletionCallback& callback) override { 74 const net::CompletionCallback& callback) override {
73 ++delete_called_count_; 75 ++delete_called_count_;
74 if (async_delete()) { 76 if (async_delete()) {
75 base::MessageLoopProxy::current()->PostTask( 77 base::ThreadTaskRunnerHandle::Get()->PostTask(
76 FROM_HERE, 78 FROM_HERE, base::Bind(&MockDatabaseTracker::AsyncDeleteDataForOrigin,
77 base::Bind(&MockDatabaseTracker::AsyncDeleteDataForOrigin, this, 79 this, callback));
78 callback));
79 return net::ERR_IO_PENDING; 80 return net::ERR_IO_PENDING;
80 } 81 }
81 return net::OK; 82 return net::OK;
82 } 83 }
83 84
84 void AsyncDeleteDataForOrigin(const net::CompletionCallback& callback) { 85 void AsyncDeleteDataForOrigin(const net::CompletionCallback& callback) {
85 callback.Run(net::OK); 86 callback.Run(net::OK);
86 } 87 }
87 88
88 void AddMockDatabase(const GURL& origin, const char* name, int size) { 89 void AddMockDatabase(const GURL& origin, const char* name, int size) {
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 base::MessageLoop message_loop_; 201 base::MessageLoop message_loop_;
201 int64 usage_; 202 int64 usage_;
202 std::set<GURL> origins_; 203 std::set<GURL> origins_;
203 storage::QuotaStatusCode delete_status_; 204 storage::QuotaStatusCode delete_status_;
204 scoped_refptr<MockDatabaseTracker> mock_tracker_; 205 scoped_refptr<MockDatabaseTracker> mock_tracker_;
205 base::WeakPtrFactory<DatabaseQuotaClientTest> weak_factory_; 206 base::WeakPtrFactory<DatabaseQuotaClientTest> weak_factory_;
206 }; 207 };
207 208
208 209
209 TEST_F(DatabaseQuotaClientTest, GetOriginUsage) { 210 TEST_F(DatabaseQuotaClientTest, GetOriginUsage) {
210 DatabaseQuotaClient client(base::MessageLoopProxy::current().get(), 211 DatabaseQuotaClient client(base::ThreadTaskRunnerHandle::Get().get(),
211 mock_tracker()); 212 mock_tracker());
212 213
213 EXPECT_EQ(0, GetOriginUsage(&client, kOriginA, kTemp)); 214 EXPECT_EQ(0, GetOriginUsage(&client, kOriginA, kTemp));
214 EXPECT_EQ(0, GetOriginUsage(&client, kOriginA, kPerm)); 215 EXPECT_EQ(0, GetOriginUsage(&client, kOriginA, kPerm));
215 216
216 mock_tracker()->AddMockDatabase(kOriginA, "fooDB", 1000); 217 mock_tracker()->AddMockDatabase(kOriginA, "fooDB", 1000);
217 EXPECT_EQ(1000, GetOriginUsage(&client, kOriginA, kTemp)); 218 EXPECT_EQ(1000, GetOriginUsage(&client, kOriginA, kTemp));
218 EXPECT_EQ(0, GetOriginUsage(&client, kOriginA, kPerm)); 219 EXPECT_EQ(0, GetOriginUsage(&client, kOriginA, kPerm));
219 220
220 EXPECT_EQ(0, GetOriginUsage(&client, kOriginB, kPerm)); 221 EXPECT_EQ(0, GetOriginUsage(&client, kOriginB, kPerm));
221 EXPECT_EQ(0, GetOriginUsage(&client, kOriginB, kTemp)); 222 EXPECT_EQ(0, GetOriginUsage(&client, kOriginB, kTemp));
222 } 223 }
223 224
224 TEST_F(DatabaseQuotaClientTest, GetOriginsForHost) { 225 TEST_F(DatabaseQuotaClientTest, GetOriginsForHost) {
225 DatabaseQuotaClient client(base::MessageLoopProxy::current().get(), 226 DatabaseQuotaClient client(base::ThreadTaskRunnerHandle::Get().get(),
226 mock_tracker()); 227 mock_tracker());
227 228
228 EXPECT_EQ(kOriginA.host(), kOriginB.host()); 229 EXPECT_EQ(kOriginA.host(), kOriginB.host());
229 EXPECT_NE(kOriginA.host(), kOriginOther.host()); 230 EXPECT_NE(kOriginA.host(), kOriginOther.host());
230 231
231 std::set<GURL> origins = GetOriginsForHost(&client, kTemp, kOriginA.host()); 232 std::set<GURL> origins = GetOriginsForHost(&client, kTemp, kOriginA.host());
232 EXPECT_TRUE(origins.empty()); 233 EXPECT_TRUE(origins.empty());
233 234
234 mock_tracker()->AddMockDatabase(kOriginA, "fooDB", 1000); 235 mock_tracker()->AddMockDatabase(kOriginA, "fooDB", 1000);
235 origins = GetOriginsForHost(&client, kTemp, kOriginA.host()); 236 origins = GetOriginsForHost(&client, kTemp, kOriginA.host());
236 EXPECT_EQ(origins.size(), 1ul); 237 EXPECT_EQ(origins.size(), 1ul);
237 EXPECT_TRUE(origins.find(kOriginA) != origins.end()); 238 EXPECT_TRUE(origins.find(kOriginA) != origins.end());
238 239
239 mock_tracker()->AddMockDatabase(kOriginB, "barDB", 1000); 240 mock_tracker()->AddMockDatabase(kOriginB, "barDB", 1000);
240 origins = GetOriginsForHost(&client, kTemp, kOriginA.host()); 241 origins = GetOriginsForHost(&client, kTemp, kOriginA.host());
241 EXPECT_EQ(origins.size(), 2ul); 242 EXPECT_EQ(origins.size(), 2ul);
242 EXPECT_TRUE(origins.find(kOriginA) != origins.end()); 243 EXPECT_TRUE(origins.find(kOriginA) != origins.end());
243 EXPECT_TRUE(origins.find(kOriginB) != origins.end()); 244 EXPECT_TRUE(origins.find(kOriginB) != origins.end());
244 245
245 EXPECT_TRUE(GetOriginsForHost(&client, kPerm, kOriginA.host()).empty()); 246 EXPECT_TRUE(GetOriginsForHost(&client, kPerm, kOriginA.host()).empty());
246 EXPECT_TRUE(GetOriginsForHost(&client, kTemp, kOriginOther.host()).empty()); 247 EXPECT_TRUE(GetOriginsForHost(&client, kTemp, kOriginOther.host()).empty());
247 } 248 }
248 249
249 TEST_F(DatabaseQuotaClientTest, GetOriginsForType) { 250 TEST_F(DatabaseQuotaClientTest, GetOriginsForType) {
250 DatabaseQuotaClient client(base::MessageLoopProxy::current().get(), 251 DatabaseQuotaClient client(base::ThreadTaskRunnerHandle::Get().get(),
251 mock_tracker()); 252 mock_tracker());
252 253
253 EXPECT_TRUE(GetOriginsForType(&client, kTemp).empty()); 254 EXPECT_TRUE(GetOriginsForType(&client, kTemp).empty());
254 EXPECT_TRUE(GetOriginsForType(&client, kPerm).empty()); 255 EXPECT_TRUE(GetOriginsForType(&client, kPerm).empty());
255 256
256 mock_tracker()->AddMockDatabase(kOriginA, "fooDB", 1000); 257 mock_tracker()->AddMockDatabase(kOriginA, "fooDB", 1000);
257 std::set<GURL> origins = GetOriginsForType(&client, kTemp); 258 std::set<GURL> origins = GetOriginsForType(&client, kTemp);
258 EXPECT_EQ(origins.size(), 1ul); 259 EXPECT_EQ(origins.size(), 1ul);
259 EXPECT_TRUE(origins.find(kOriginA) != origins.end()); 260 EXPECT_TRUE(origins.find(kOriginA) != origins.end());
260 261
261 EXPECT_TRUE(GetOriginsForType(&client, kPerm).empty()); 262 EXPECT_TRUE(GetOriginsForType(&client, kPerm).empty());
262 } 263 }
263 264
264 TEST_F(DatabaseQuotaClientTest, DeleteOriginData) { 265 TEST_F(DatabaseQuotaClientTest, DeleteOriginData) {
265 DatabaseQuotaClient client(base::MessageLoopProxy::current().get(), 266 DatabaseQuotaClient client(base::ThreadTaskRunnerHandle::Get().get(),
266 mock_tracker()); 267 mock_tracker());
267 268
268 // Perm deletions are short circuited in the Client and 269 // Perm deletions are short circuited in the Client and
269 // should not reach the DatabaseTracker. 270 // should not reach the DatabaseTracker.
270 EXPECT_TRUE(DeleteOriginData(&client, kPerm, kOriginA)); 271 EXPECT_TRUE(DeleteOriginData(&client, kPerm, kOriginA));
271 EXPECT_EQ(0, mock_tracker()->delete_called_count()); 272 EXPECT_EQ(0, mock_tracker()->delete_called_count());
272 273
273 mock_tracker()->set_async_delete(false); 274 mock_tracker()->set_async_delete(false);
274 EXPECT_TRUE(DeleteOriginData(&client, kTemp, kOriginA)); 275 EXPECT_TRUE(DeleteOriginData(&client, kTemp, kOriginA));
275 EXPECT_EQ(1, mock_tracker()->delete_called_count()); 276 EXPECT_EQ(1, mock_tracker()->delete_called_count());
276 277
277 mock_tracker()->set_async_delete(true); 278 mock_tracker()->set_async_delete(true);
278 EXPECT_TRUE(DeleteOriginData(&client, kTemp, kOriginA)); 279 EXPECT_TRUE(DeleteOriginData(&client, kTemp, kOriginA));
279 EXPECT_EQ(2, mock_tracker()->delete_called_count()); 280 EXPECT_EQ(2, mock_tracker()->delete_called_count());
280 } 281 }
281 282
282 } // namespace content 283 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/compositor/software_output_device_ozone_unittest.cc ('k') | content/browser/database_tracker_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698