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

Side by Side Diff: content/browser/quota/mock_quota_manager_unittest.cc

Issue 2800893002: Use ScopedTaskEnvironment instead of MessageLoop in content unit tests. (Closed)
Patch Set: Created 3 years, 8 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 "content/browser/quota/mock_quota_manager.h" 5 #include "content/browser/quota/mock_quota_manager.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <set> 8 #include <set>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/files/file_util.h" 11 #include "base/files/file_util.h"
12 #include "base/files/scoped_temp_dir.h" 12 #include "base/files/scoped_temp_dir.h"
13 #include "base/macros.h" 13 #include "base/macros.h"
14 #include "base/run_loop.h" 14 #include "base/run_loop.h"
15 #include "base/test/scoped_task_environment.h"
15 #include "base/threading/thread_task_runner_handle.h" 16 #include "base/threading/thread_task_runner_handle.h"
16 #include "content/public/test/mock_special_storage_policy.h" 17 #include "content/public/test/mock_special_storage_policy.h"
17 #include "content/public/test/mock_storage_client.h" 18 #include "content/public/test/mock_storage_client.h"
18 #include "testing/gtest/include/gtest/gtest.h" 19 #include "testing/gtest/include/gtest/gtest.h"
19 20
20 using storage::kQuotaStatusOk; 21 using storage::kQuotaStatusOk;
21 using storage::kStorageTypePersistent; 22 using storage::kStorageTypePersistent;
22 using storage::kStorageTypeTemporary; 23 using storage::kStorageTypeTemporary;
23 24
24 namespace content { 25 namespace content {
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 95
95 const std::set<GURL>& origins() const { 96 const std::set<GURL>& origins() const {
96 return origins_; 97 return origins_;
97 } 98 }
98 99
99 const StorageType& type() const { 100 const StorageType& type() const {
100 return type_; 101 return type_;
101 } 102 }
102 103
103 private: 104 private:
104 base::MessageLoop message_loop_; 105 base::test::ScopedTaskEnvironment scoped_task_environment_;
105 base::ScopedTempDir data_dir_; 106 base::ScopedTempDir data_dir_;
106 scoped_refptr<MockQuotaManager> manager_; 107 scoped_refptr<MockQuotaManager> manager_;
107 scoped_refptr<MockSpecialStoragePolicy> policy_; 108 scoped_refptr<MockSpecialStoragePolicy> policy_;
108 109
109 int deletion_callback_count_; 110 int deletion_callback_count_;
110 111
111 std::set<GURL> origins_; 112 std::set<GURL> origins_;
112 StorageType type_; 113 StorageType type_;
113 114
114 base::WeakPtrFactory<MockQuotaManagerTest> weak_factory_; 115 base::WeakPtrFactory<MockQuotaManagerTest> weak_factory_;
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 219
219 GetModifiedOrigins(kTemporary, now - a_minute); 220 GetModifiedOrigins(kTemporary, now - a_minute);
220 base::RunLoop().RunUntilIdle(); 221 base::RunLoop().RunUntilIdle();
221 222
222 EXPECT_EQ(kTemporary, type()); 223 EXPECT_EQ(kTemporary, type());
223 EXPECT_EQ(1UL, origins().size()); 224 EXPECT_EQ(1UL, origins().size());
224 EXPECT_EQ(0UL, origins().count(kOrigin1)); 225 EXPECT_EQ(0UL, origins().count(kOrigin1));
225 EXPECT_EQ(1UL, origins().count(kOrigin2)); 226 EXPECT_EQ(1UL, origins().count(kOrigin2));
226 } 227 }
227 } // namespace content 228 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/fileapi/transient_file_util_unittest.cc ('k') | content/browser/quota/quota_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698