| 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 #ifndef CONTENT_SHELL_BROWSER_LAYOUT_TEST_BLINK_TEST_CONTROLLER_H_ | 5 #ifndef CONTENT_SHELL_BROWSER_LAYOUT_TEST_BLINK_TEST_CONTROLLER_H_ |
| 6 #define CONTENT_SHELL_BROWSER_LAYOUT_TEST_BLINK_TEST_CONTROLLER_H_ | 6 #define CONTENT_SHELL_BROWSER_LAYOUT_TEST_BLINK_TEST_CONTROLLER_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <ostream> | 9 #include <ostream> |
| 10 #include <string> | 10 #include <string> |
| 11 | 11 |
| 12 #include "base/cancelable_callback.h" | 12 #include "base/cancelable_callback.h" |
| 13 #include "base/files/file_path.h" | 13 #include "base/files/file_path.h" |
| 14 #include "base/macros.h" | 14 #include "base/macros.h" |
| 15 #include "base/memory/scoped_ptr.h" | 15 #include "base/memory/scoped_ptr.h" |
| 16 #include "base/synchronization/lock.h" | 16 #include "base/synchronization/lock.h" |
| 17 #include "base/threading/non_thread_safe.h" | 17 #include "base/threading/non_thread_safe.h" |
| 18 #include "build/build_config.h" | 18 #include "build/build_config.h" |
| 19 #include "components/test_runner/layout_dump_flags.h" | |
| 20 #include "content/public/browser/bluetooth_chooser.h" | 19 #include "content/public/browser/bluetooth_chooser.h" |
| 21 #include "content/public/browser/gpu_data_manager_observer.h" | 20 #include "content/public/browser/gpu_data_manager_observer.h" |
| 22 #include "content/public/browser/notification_observer.h" | 21 #include "content/public/browser/notification_observer.h" |
| 23 #include "content/public/browser/notification_registrar.h" | 22 #include "content/public/browser/notification_registrar.h" |
| 24 #include "content/public/browser/web_contents_observer.h" | 23 #include "content/public/browser/web_contents_observer.h" |
| 25 #include "content/public/common/web_preferences.h" | 24 #include "content/public/common/web_preferences.h" |
| 26 #include "content/shell/common/leak_detection_result.h" | 25 #include "content/shell/common/leak_detection_result.h" |
| 27 #include "ui/gfx/geometry/size.h" | 26 #include "ui/gfx/geometry/size.h" |
| 28 | 27 |
| 29 #if defined(OS_ANDROID) | 28 #if defined(OS_ANDROID) |
| 30 #include "base/threading/thread_restrictions.h" | 29 #include "base/threading/thread_restrictions.h" |
| 31 #endif | 30 #endif |
| 32 | 31 |
| 33 class SkBitmap; | 32 class SkBitmap; |
| 34 | 33 |
| 34 namespace test_runner { |
| 35 struct LayoutDumpFlags; |
| 36 } |
| 37 |
| 35 namespace url { | 38 namespace url { |
| 36 class Origin; | 39 class Origin; |
| 37 } | 40 } |
| 38 | 41 |
| 39 namespace content { | 42 namespace content { |
| 40 | 43 |
| 41 class LayoutTestBluetoothChooserFactory; | 44 class LayoutTestBluetoothChooserFactory; |
| 42 class LayoutTestDevToolsFrontend; | 45 class LayoutTestDevToolsFrontend; |
| 43 class RenderFrameHost; | 46 class RenderFrameHost; |
| 44 class Shell; | 47 class Shell; |
| (...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 173 | 176 |
| 174 static BlinkTestController* instance_; | 177 static BlinkTestController* instance_; |
| 175 | 178 |
| 176 void DiscardMainWindow(); | 179 void DiscardMainWindow(); |
| 177 void SendTestConfiguration(); | 180 void SendTestConfiguration(); |
| 178 | 181 |
| 179 // Message handlers. | 182 // Message handlers. |
| 180 void OnAudioDump(const std::vector<unsigned char>& audio_dump); | 183 void OnAudioDump(const std::vector<unsigned char>& audio_dump); |
| 181 void OnImageDump(const std::string& actual_pixel_hash, const SkBitmap& image); | 184 void OnImageDump(const std::string& actual_pixel_hash, const SkBitmap& image); |
| 182 void OnTextDump(const std::string& dump); | 185 void OnTextDump(const std::string& dump); |
| 183 void OnInitiateLayoutDump(test_runner::LayoutDumpFlags layout_dump_flags); | 186 void OnInitiateLayoutDump( |
| 187 const test_runner::LayoutDumpFlags& layout_dump_flags); |
| 184 void OnLayoutDumpResponse(RenderFrameHost* sender, const std::string& dump); | 188 void OnLayoutDumpResponse(RenderFrameHost* sender, const std::string& dump); |
| 185 void OnPrintMessage(const std::string& message); | 189 void OnPrintMessage(const std::string& message); |
| 186 void OnOverridePreferences(const WebPreferences& prefs); | 190 void OnOverridePreferences(const WebPreferences& prefs); |
| 187 void OnTestFinished(); | 191 void OnTestFinished(); |
| 188 void OnClearDevToolsLocalStorage(); | 192 void OnClearDevToolsLocalStorage(); |
| 189 void OnShowDevTools(const std::string& settings, | 193 void OnShowDevTools(const std::string& settings, |
| 190 const std::string& frontend_url); | 194 const std::string& frontend_url); |
| 191 void OnCloseDevTools(); | 195 void OnCloseDevTools(); |
| 192 void OnGoToOffset(int offset); | 196 void OnGoToOffset(int offset); |
| 193 void OnReload(); | 197 void OnReload(); |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 251 // waiting on the UI thread while layout tests are being ran. | 255 // waiting on the UI thread while layout tests are being ran. |
| 252 ScopedAllowWaitForAndroidLayoutTests reduced_restrictions_; | 256 ScopedAllowWaitForAndroidLayoutTests reduced_restrictions_; |
| 253 #endif | 257 #endif |
| 254 | 258 |
| 255 DISALLOW_COPY_AND_ASSIGN(BlinkTestController); | 259 DISALLOW_COPY_AND_ASSIGN(BlinkTestController); |
| 256 }; | 260 }; |
| 257 | 261 |
| 258 } // namespace content | 262 } // namespace content |
| 259 | 263 |
| 260 #endif // CONTENT_SHELL_BROWSER_LAYOUT_TEST_BLINK_TEST_CONTROLLER_H_ | 264 #endif // CONTENT_SHELL_BROWSER_LAYOUT_TEST_BLINK_TEST_CONTROLLER_H_ |
| OLD | NEW |