Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(55)

Side by Side Diff: content/public/test/browser_test_base.cc

Issue 145293007: ui: No more TestCompositor. Use NullDraw contexts in unit tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: testsnulldraw: Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 20 matching lines...) Expand all
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/compositor/image_transport_factory.h" 40 #include "content/browser/compositor/image_transport_factory.h"
41 #include "ui/compositor/test/test_context_factory.h"
42 #endif 41 #endif
43 42
44 namespace content { 43 namespace content {
45 namespace { 44 namespace {
46 45
47 #if defined(OS_POSIX) 46 #if defined(OS_POSIX)
48 // On SIGTERM (sent by the runner on timeouts), dump a stack trace (to make 47 // 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 48 // debugging easier) and also exit with a known error code (so that the test
50 // framework considers this a failure -- http://crbug.com/57578). 49 // framework considers this a failure -- http://crbug.com/57578).
51 // Note: We only want to do this in the browser process, and not forked 50 // Note: We only want to do this in the browser process, and not forked
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
292 use_software_compositing_ = true; 291 use_software_compositing_ = true;
293 } 292 }
294 293
295 bool BrowserTestBase::UsingOSMesa() const { 294 bool BrowserTestBase::UsingOSMesa() const {
296 CommandLine* cmd = CommandLine::ForCurrentProcess(); 295 CommandLine* cmd = CommandLine::ForCurrentProcess();
297 return cmd->GetSwitchValueASCII(switches::kUseGL) == 296 return cmd->GetSwitchValueASCII(switches::kUseGL) ==
298 gfx::kGLImplementationOSMesaName; 297 gfx::kGLImplementationOSMesaName;
299 } 298 }
300 299
301 } // namespace content 300 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698