| 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 #include "chrome/test/base/view_event_test_base.h" | 5 #include "chrome/test/base/view_event_test_base.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
| 9 #include "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
| 10 #include "base/strings/string_number_conversions.h" | 10 #include "base/strings/string_number_conversions.h" |
| 11 #include "chrome/test/base/interactive_test_utils.h" | 11 #include "chrome/test/base/interactive_test_utils.h" |
| 12 #include "chrome/test/base/testing_browser_process.h" | 12 #include "chrome/test/base/testing_browser_process.h" |
| 13 #include "chrome/test/base/ui_test_utils.h" | 13 #include "chrome/test/base/ui_test_utils.h" |
| 14 #include "content/public/browser/browser_thread.h" | |
| 15 #include "ui/base/ime/input_method_initializer.h" | 14 #include "ui/base/ime/input_method_initializer.h" |
| 16 #include "ui/base/test/ui_controls.h" | 15 #include "ui/base/test/ui_controls.h" |
| 17 #include "ui/compositor/test/context_factories_for_test.h" | 16 #include "ui/compositor/test/context_factories_for_test.h" |
| 18 #include "ui/message_center/message_center.h" | 17 #include "ui/message_center/message_center.h" |
| 19 #include "ui/views/view.h" | 18 #include "ui/views/view.h" |
| 20 #include "ui/views/widget/desktop_aura/desktop_screen.h" | 19 #include "ui/views/widget/desktop_aura/desktop_screen.h" |
| 21 #include "ui/views/widget/widget.h" | 20 #include "ui/views/widget/widget.h" |
| 22 | 21 |
| 23 #if defined(USE_ASH) | 22 #if defined(USE_ASH) |
| 24 #include "ash/shell.h" | 23 #include "ash/shell.h" |
| (...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 237 dnd_thread_.reset(NULL); | 236 dnd_thread_.reset(NULL); |
| 238 } | 237 } |
| 239 | 238 |
| 240 void ViewEventTestBase::RunTestMethod(const base::Closure& task) { | 239 void ViewEventTestBase::RunTestMethod(const base::Closure& task) { |
| 241 StopBackgroundThread(); | 240 StopBackgroundThread(); |
| 242 | 241 |
| 243 task.Run(); | 242 task.Run(); |
| 244 if (HasFatalFailure()) | 243 if (HasFatalFailure()) |
| 245 Done(); | 244 Done(); |
| 246 } | 245 } |
| OLD | NEW |