OLD | NEW |
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 "chrome/browser/extensions/activity_log/counting_policy.h" | 5 #include "chrome/browser/extensions/activity_log/counting_policy.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include <memory> | 10 #include <memory> |
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
67 test_user_manager_.reset(); | 67 test_user_manager_.reset(); |
68 #endif | 68 #endif |
69 base::RunLoop().RunUntilIdle(); | 69 base::RunLoop().RunUntilIdle(); |
70 profile_.reset(NULL); | 70 profile_.reset(NULL); |
71 base::RunLoop().RunUntilIdle(); | 71 base::RunLoop().RunUntilIdle(); |
72 } | 72 } |
73 | 73 |
74 // Wait for the task queue for the specified thread to empty. | 74 // Wait for the task queue for the specified thread to empty. |
75 void WaitOnThread(const BrowserThread::ID& thread) { | 75 void WaitOnThread(const BrowserThread::ID& thread) { |
76 BrowserThread::PostTaskAndReply( | 76 BrowserThread::PostTaskAndReply( |
77 thread, FROM_HERE, base::Bind(&base::DoNothing), | 77 thread, FROM_HERE, base::BindOnce(&base::DoNothing), |
78 base::MessageLoop::current()->QuitWhenIdleClosure()); | 78 base::MessageLoop::current()->QuitWhenIdleClosure()); |
79 base::RunLoop().Run(); | 79 base::RunLoop().Run(); |
80 } | 80 } |
81 | 81 |
82 // A wrapper function for CheckReadFilteredData, so that we don't need to | 82 // A wrapper function for CheckReadFilteredData, so that we don't need to |
83 // enter empty string values for parameters we don't care about. | 83 // enter empty string values for parameters we don't care about. |
84 void CheckReadData(ActivityLogDatabasePolicy* policy, | 84 void CheckReadData(ActivityLogDatabasePolicy* policy, |
85 const std::string& extension_id, | 85 const std::string& extension_id, |
86 int day, | 86 int day, |
87 const base::Callback<void( | 87 const base::Callback<void( |
(...skipping 1192 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1280 | 1280 |
1281 action_ids.push_back(2); | 1281 action_ids.push_back(2); |
1282 CheckRemoveActions( | 1282 CheckRemoveActions( |
1283 policy, action_ids, base::Bind(&CountingPolicyTest::Action2Deleted)); | 1283 policy, action_ids, base::Bind(&CountingPolicyTest::Action2Deleted)); |
1284 action_ids.clear(); | 1284 action_ids.clear(); |
1285 | 1285 |
1286 policy->Close(); | 1286 policy->Close(); |
1287 } | 1287 } |
1288 | 1288 |
1289 } // namespace extensions | 1289 } // namespace extensions |
OLD | NEW |