OLD | NEW |
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 #ifndef COMPONENTS_TEST_RUNNER_TEST_RUNNER_H_ | 5 #ifndef COMPONENTS_TEST_RUNNER_TEST_RUNNER_H_ |
6 #define COMPONENTS_TEST_RUNNER_TEST_RUNNER_H_ | 6 #define COMPONENTS_TEST_RUNNER_TEST_RUNNER_H_ |
7 | 7 |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include <deque> | 10 #include <deque> |
| 11 #include <memory> |
11 #include <set> | 12 #include <set> |
12 #include <string> | 13 #include <string> |
13 #include <vector> | 14 #include <vector> |
14 | 15 |
15 #include "base/macros.h" | 16 #include "base/macros.h" |
16 #include "base/memory/scoped_ptr.h" | |
17 #include "base/memory/weak_ptr.h" | 17 #include "base/memory/weak_ptr.h" |
18 #include "components/test_runner/layout_test_runtime_flags.h" | 18 #include "components/test_runner/layout_test_runtime_flags.h" |
19 #include "components/test_runner/test_runner_export.h" | 19 #include "components/test_runner/test_runner_export.h" |
20 #include "components/test_runner/web_test_runner.h" | 20 #include "components/test_runner/web_test_runner.h" |
21 #include "third_party/WebKit/public/platform/WebImage.h" | 21 #include "third_party/WebKit/public/platform/WebImage.h" |
22 #include "v8/include/v8.h" | 22 #include "v8/include/v8.h" |
23 | 23 |
24 class GURL; | 24 class GURL; |
25 class SkBitmap; | 25 class SkBitmap; |
26 | 26 |
(...skipping 716 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
743 std::vector<unsigned char> audio_data_; | 743 std::vector<unsigned char> audio_data_; |
744 | 744 |
745 TestInterfaces* test_interfaces_; | 745 TestInterfaces* test_interfaces_; |
746 WebTestDelegate* delegate_; | 746 WebTestDelegate* delegate_; |
747 blink::WebView* web_view_; | 747 blink::WebView* web_view_; |
748 | 748 |
749 // This is non-0 IFF a load is in progress. | 749 // This is non-0 IFF a load is in progress. |
750 blink::WebFrame* top_loading_frame_; | 750 blink::WebFrame* top_loading_frame_; |
751 | 751 |
752 // WebContentSettingsClient mock object. | 752 // WebContentSettingsClient mock object. |
753 scoped_ptr<MockContentSettingsClient> mock_content_settings_client_; | 753 std::unique_ptr<MockContentSettingsClient> mock_content_settings_client_; |
754 | 754 |
755 bool pointer_locked_; | 755 bool pointer_locked_; |
756 enum { | 756 enum { |
757 PointerLockWillSucceed, | 757 PointerLockWillSucceed, |
758 PointerLockWillRespondAsync, | 758 PointerLockWillRespondAsync, |
759 PointerLockWillFailSync, | 759 PointerLockWillFailSync, |
760 } pointer_lock_planned_result_; | 760 } pointer_lock_planned_result_; |
761 bool use_mock_theme_; | 761 bool use_mock_theme_; |
762 | 762 |
763 scoped_ptr<MockCredentialManagerClient> credential_manager_client_; | 763 std::unique_ptr<MockCredentialManagerClient> credential_manager_client_; |
764 scoped_ptr<MockScreenOrientationClient> mock_screen_orientation_client_; | 764 std::unique_ptr<MockScreenOrientationClient> mock_screen_orientation_client_; |
765 scoped_ptr<MockWebSpeechRecognizer> speech_recognizer_; | 765 std::unique_ptr<MockWebSpeechRecognizer> speech_recognizer_; |
766 scoped_ptr<MockWebUserMediaClient> user_media_client_; | 766 std::unique_ptr<MockWebUserMediaClient> user_media_client_; |
767 scoped_ptr<SpellCheckClient> spellcheck_; | 767 std::unique_ptr<SpellCheckClient> spellcheck_; |
768 | 768 |
769 // Number of currently active color choosers. | 769 // Number of currently active color choosers. |
770 int chooser_count_; | 770 int chooser_count_; |
771 | 771 |
772 // Captured drag image. | 772 // Captured drag image. |
773 blink::WebImage drag_image_; | 773 blink::WebImage drag_image_; |
774 | 774 |
775 // View that was focused by a previous call to TestRunner::SetFocus method. | 775 // View that was focused by a previous call to TestRunner::SetFocus method. |
776 // Note - this can be a dangling pointer to an already destroyed WebView (this | 776 // Note - this can be a dangling pointer to an already destroyed WebView (this |
777 // is ok, because this is taken care of in WebTestDelegate::SetFocus). | 777 // is ok, because this is taken care of in WebTestDelegate::SetFocus). |
778 blink::WebView* previously_focused_view_; | 778 blink::WebView* previously_focused_view_; |
779 | 779 |
780 std::set<blink::WebView*> views_with_scheduled_animations_; | 780 std::set<blink::WebView*> views_with_scheduled_animations_; |
781 | 781 |
782 base::WeakPtrFactory<TestRunner> weak_factory_; | 782 base::WeakPtrFactory<TestRunner> weak_factory_; |
783 | 783 |
784 DISALLOW_COPY_AND_ASSIGN(TestRunner); | 784 DISALLOW_COPY_AND_ASSIGN(TestRunner); |
785 }; | 785 }; |
786 | 786 |
787 } // namespace test_runner | 787 } // namespace test_runner |
788 | 788 |
789 #endif // COMPONENTS_TEST_RUNNER_TEST_RUNNER_H_ | 789 #endif // COMPONENTS_TEST_RUNNER_TEST_RUNNER_H_ |
OLD | NEW |