| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "content/public/test/browser_test_base.h" | 5 #include "content/public/test/browser_test_base.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/debug/stack_trace.h" | 9 #include "base/debug/stack_trace.h" |
| 10 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
| (...skipping 19 matching lines...) Expand all Loading... |
| 30 #include "base/power_monitor/power_monitor_device_source.h" | 30 #include "base/power_monitor/power_monitor_device_source.h" |
| 31 #endif | 31 #endif |
| 32 | 32 |
| 33 #if defined(OS_ANDROID) | 33 #if defined(OS_ANDROID) |
| 34 #include "base/threading/thread_restrictions.h" | 34 #include "base/threading/thread_restrictions.h" |
| 35 #include "content/public/browser/browser_main_runner.h" | 35 #include "content/public/browser/browser_main_runner.h" |
| 36 #include "content/public/browser/browser_thread.h" | 36 #include "content/public/browser/browser_thread.h" |
| 37 #endif | 37 #endif |
| 38 | 38 |
| 39 #if defined(USE_AURA) | 39 #if defined(USE_AURA) |
| 40 #include "content/browser/aura/image_transport_factory.h" | 40 #include "content/browser/compositor/image_transport_factory.h" |
| 41 #include "ui/compositor/test/test_context_factory.h" | 41 #include "ui/compositor/test/test_context_factory.h" |
| 42 #endif | 42 #endif |
| 43 | 43 |
| 44 namespace content { | 44 namespace content { |
| 45 namespace { | 45 namespace { |
| 46 | 46 |
| 47 #if defined(OS_POSIX) | 47 #if defined(OS_POSIX) |
| 48 // On SIGTERM (sent by the runner on timeouts), dump a stack trace (to make | 48 // On SIGTERM (sent by the runner on timeouts), dump a stack trace (to make |
| 49 // debugging easier) and also exit with a known error code (so that the test | 49 // debugging easier) and also exit with a known error code (so that the test |
| 50 // framework considers this a failure -- http://crbug.com/57578). | 50 // framework considers this a failure -- http://crbug.com/57578). |
| (...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 296 #if !defined(USE_AURA) && !defined(OS_MACOSX) | 296 #if !defined(USE_AURA) && !defined(OS_MACOSX) |
| 297 // TODO(danakj): Remove when GTK linux is no more. | 297 // TODO(danakj): Remove when GTK linux is no more. |
| 298 NOTREACHED(); | 298 NOTREACHED(); |
| 299 #endif | 299 #endif |
| 300 | 300 |
| 301 DCHECK(allow_osmesa_) << "Can't use GL with software compositing"; | 301 DCHECK(allow_osmesa_) << "Can't use GL with software compositing"; |
| 302 use_software_compositing_ = true; | 302 use_software_compositing_ = true; |
| 303 } | 303 } |
| 304 | 304 |
| 305 } // namespace content | 305 } // namespace content |
| OLD | NEW |