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 #ifndef CHROME_TEST_BASE_UI_TEST_UTILS_H_ | 5 #ifndef CHROME_TEST_BASE_UI_TEST_UTILS_H_ |
6 #define CHROME_TEST_BASE_UI_TEST_UTILS_H_ | 6 #define CHROME_TEST_BASE_UI_TEST_UTILS_H_ |
7 | 7 |
8 #include <map> | 8 #include <map> |
9 #include <queue> | 9 #include <queue> |
10 #include <set> | 10 #include <set> |
(...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
299 const base::Closure& quit_task, | 299 const base::Closure& quit_task, |
300 history::QueryResults* results); | 300 history::QueryResults* results); |
301 | 301 |
302 std::vector<GURL> urls_; | 302 std::vector<GURL> urls_; |
303 | 303 |
304 base::CancelableTaskTracker tracker_; | 304 base::CancelableTaskTracker tracker_; |
305 | 305 |
306 DISALLOW_COPY_AND_ASSIGN(HistoryEnumerator); | 306 DISALLOW_COPY_AND_ASSIGN(HistoryEnumerator); |
307 }; | 307 }; |
308 | 308 |
309 // Wait for HistoryService to load. | |
sdefresne
2014/09/23 08:45:10
You can move this class in ui_test_utils.cc since
nshaik
2014/10/29 08:43:39
Done.
| |
310 class WaitHistoryLoadedObserver : public history::HistoryServiceObserver { | |
311 public: | |
312 explicit WaitHistoryLoadedObserver(content::MessageLoopRunner* runner); | |
313 // Is called when |service| is loaded. | |
sdefresne
2014/10/20 13:15:43
// history::HistoryServiceObserver:
| |
314 virtual void HistoryServiceLoaded(HistoryService* service) OVERRIDE; | |
sdefresne
2014/10/20 13:15:43
OVERRIDE -> override
| |
315 virtual ~WaitHistoryLoadedObserver(); | |
sdefresne
2014/10/20 13:15:43
Move the destructor with the constructor.
| |
316 | |
317 private: | |
318 // weak | |
319 content::MessageLoopRunner* runner_; | |
320 }; | |
321 | |
309 } // namespace ui_test_utils | 322 } // namespace ui_test_utils |
310 | 323 |
311 #endif // CHROME_TEST_BASE_UI_TEST_UTILS_H_ | 324 #endif // CHROME_TEST_BASE_UI_TEST_UTILS_H_ |
OLD | NEW |