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 // Contains code shared by all browsing data browsertests. | 5 // Contains code shared by all browsing data browsertests. |
6 | 6 |
7 #ifndef CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_HELPER_BROWSERTEST_H_ | 7 #ifndef CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_HELPER_BROWSERTEST_H_ |
8 #define CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_HELPER_BROWSERTEST_H_ | 8 #define CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_HELPER_BROWSERTEST_H_ |
9 | 9 |
10 #include <list> | 10 #include <list> |
11 | 11 |
12 #include "base/logging.h" | 12 #include "base/logging.h" |
13 #include "base/macros.h" | 13 #include "base/macros.h" |
14 #include "base/message_loop/message_loop.h" | 14 #include "base/run_loop.h" |
15 | 15 |
16 // This template can be used for the StartFetching methods of the browsing data | 16 // This template can be used for the StartFetching methods of the browsing data |
17 // helper classes. It is supposed to be instantiated with the respective | 17 // helper classes. It is supposed to be instantiated with the respective |
18 // browsing data info type. | 18 // browsing data info type. |
19 template <typename T> | 19 template <typename T> |
20 class BrowsingDataHelperCallback { | 20 class BrowsingDataHelperCallback { |
21 public: | 21 public: |
22 BrowsingDataHelperCallback() {} | 22 BrowsingDataHelperCallback() {} |
23 | 23 |
24 const std::list<T>& result() { | 24 const std::list<T>& result() { |
25 base::MessageLoop::current()->Run(); | 25 run_loop_.Run(); |
26 DCHECK(has_result_); | 26 DCHECK(has_result_); |
27 return result_; | 27 return result_; |
28 } | 28 } |
29 | 29 |
30 void callback(const std::list<T>& info) { | 30 void callback(const std::list<T>& info) { |
31 result_ = info; | 31 result_ = info; |
32 has_result_ = true; | 32 has_result_ = true; |
33 base::MessageLoop::current()->QuitWhenIdle(); | 33 run_loop_.QuitWhenIdle(); |
34 } | 34 } |
35 | 35 |
36 private: | 36 private: |
| 37 base::RunLoop run_loop_; |
37 bool has_result_ = false; | 38 bool has_result_ = false; |
38 std::list<T> result_; | 39 std::list<T> result_; |
39 | 40 |
40 DISALLOW_COPY_AND_ASSIGN(BrowsingDataHelperCallback); | 41 DISALLOW_COPY_AND_ASSIGN(BrowsingDataHelperCallback); |
41 }; | 42 }; |
42 | 43 |
43 #endif // CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_HELPER_BROWSERTEST_H_ | 44 #endif // CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_HELPER_BROWSERTEST_H_ |
OLD | NEW |