| 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 CONTENT_SHELL_RENDERER_LAYOUT_TEST_BLINK_TEST_RUNNER_H_ | 5 #ifndef CONTENT_SHELL_RENDERER_LAYOUT_TEST_BLINK_TEST_RUNNER_H_ | 
| 6 #define CONTENT_SHELL_RENDERER_LAYOUT_TEST_BLINK_TEST_RUNNER_H_ | 6 #define CONTENT_SHELL_RENDERER_LAYOUT_TEST_BLINK_TEST_RUNNER_H_ | 
| 7 | 7 | 
| 8 #include <deque> | 8 #include <deque> | 
|  | 9 #include <memory> | 
| 9 #include <vector> | 10 #include <vector> | 
| 10 | 11 | 
| 11 #include "base/callback.h" | 12 #include "base/callback.h" | 
| 12 #include "base/files/file_path.h" | 13 #include "base/files/file_path.h" | 
| 13 #include "base/macros.h" | 14 #include "base/macros.h" | 
| 14 #include "base/memory/scoped_ptr.h" |  | 
| 15 #include "components/test_runner/test_preferences.h" | 15 #include "components/test_runner/test_preferences.h" | 
| 16 #include "components/test_runner/web_test_delegate.h" | 16 #include "components/test_runner/web_test_delegate.h" | 
| 17 #include "content/public/common/page_state.h" | 17 #include "content/public/common/page_state.h" | 
| 18 #include "content/public/renderer/render_view_observer.h" | 18 #include "content/public/renderer/render_view_observer.h" | 
| 19 #include "content/public/renderer/render_view_observer_tracker.h" | 19 #include "content/public/renderer/render_view_observer_tracker.h" | 
| 20 #include "content/shell/common/layout_test/layout_test_bluetooth_fake_adapter_se
     tter.mojom.h" | 20 #include "content/shell/common/layout_test/layout_test_bluetooth_fake_adapter_se
     tter.mojom.h" | 
| 21 #include "content/shell/common/shell_test_configuration.h" | 21 #include "content/shell/common/shell_test_configuration.h" | 
| 22 #include "v8/include/v8.h" | 22 #include "v8/include/v8.h" | 
| 23 | 23 | 
| 24 class SkBitmap; | 24 class SkBitmap; | 
| (...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 208   std::vector<std::vector<PageState> > session_histories_; | 208   std::vector<std::vector<PageState> > session_histories_; | 
| 209   std::vector<unsigned> current_entry_indexes_; | 209   std::vector<unsigned> current_entry_indexes_; | 
| 210 | 210 | 
| 211   std::deque<base::Callback<void(const std::vector<std::string>&)>> | 211   std::deque<base::Callback<void(const std::vector<std::string>&)>> | 
| 212       get_bluetooth_events_callbacks_; | 212       get_bluetooth_events_callbacks_; | 
| 213 | 213 | 
| 214   bool is_main_window_; | 214   bool is_main_window_; | 
| 215 | 215 | 
| 216   bool focus_on_next_commit_; | 216   bool focus_on_next_commit_; | 
| 217 | 217 | 
| 218   scoped_ptr<LeakDetector> leak_detector_; | 218   std::unique_ptr<LeakDetector> leak_detector_; | 
| 219 | 219 | 
| 220   DISALLOW_COPY_AND_ASSIGN(BlinkTestRunner); | 220   DISALLOW_COPY_AND_ASSIGN(BlinkTestRunner); | 
| 221 }; | 221 }; | 
| 222 | 222 | 
| 223 }  // namespace content | 223 }  // namespace content | 
| 224 | 224 | 
| 225 #endif  // CONTENT_SHELL_RENDERER_LAYOUT_TEST_BLINK_TEST_RUNNER_H_ | 225 #endif  // CONTENT_SHELL_RENDERER_LAYOUT_TEST_BLINK_TEST_RUNNER_H_ | 
| OLD | NEW | 
|---|