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

Side by Side Diff: content/browser/renderer_host/render_widget_host_unittest.cc

Issue 369923003: NoTransportImageTransportFactory is compiled into only test targets. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: InitializeForUnitTests get scoped_ptr Created 6 years, 5 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
OLDNEW
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 "base/basictypes.h" 5 #include "base/basictypes.h"
6 #include "base/bind.h" 6 #include "base/bind.h"
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/memory/shared_memory.h" 9 #include "base/memory/shared_memory.h"
10 #include "base/timer/timer.h" 10 #include "base/timer/timer.h"
(...skipping 12 matching lines...) Expand all
23 #include "testing/gtest/include/gtest/gtest.h" 23 #include "testing/gtest/include/gtest/gtest.h"
24 #include "ui/events/keycodes/keyboard_codes.h" 24 #include "ui/events/keycodes/keyboard_codes.h"
25 #include "ui/gfx/canvas.h" 25 #include "ui/gfx/canvas.h"
26 #include "ui/gfx/screen.h" 26 #include "ui/gfx/screen.h"
27 27
28 #if defined(OS_ANDROID) 28 #if defined(OS_ANDROID)
29 #include "content/browser/renderer_host/render_widget_host_view_android.h" 29 #include "content/browser/renderer_host/render_widget_host_view_android.h"
30 #endif 30 #endif
31 31
32 #if defined(USE_AURA) || (defined(OS_MACOSX) && !defined(OS_IOS)) 32 #if defined(USE_AURA) || (defined(OS_MACOSX) && !defined(OS_IOS))
33 #include "content/browser/compositor/image_transport_factory.h" 33 #include "content/browser/compositor/test/no_transport_image_transport_factory.h "
34 #include "ui/compositor/test/in_process_context_factory.h"
35 #endif 34 #endif
36 35
37 #if defined(USE_AURA) 36 #if defined(USE_AURA)
38 #include "content/browser/renderer_host/render_widget_host_view_aura.h" 37 #include "content/browser/renderer_host/render_widget_host_view_aura.h"
39 #include "content/browser/renderer_host/ui_events_helper.h" 38 #include "content/browser/renderer_host/ui_events_helper.h"
40 #include "ui/aura/env.h" 39 #include "ui/aura/env.h"
41 #include "ui/aura/test/test_screen.h" 40 #include "ui/aura/test/test_screen.h"
42 #include "ui/events/event.h" 41 #include "ui/events/event.h"
43 #endif 42 #endif
44 43
(...skipping 405 matching lines...) Expand 10 before | Expand all | Expand 10 after
450 virtual void SetUp() { 449 virtual void SetUp() {
451 CommandLine* command_line = CommandLine::ForCurrentProcess(); 450 CommandLine* command_line = CommandLine::ForCurrentProcess();
452 command_line->AppendSwitch(switches::kValidateInputEventStream); 451 command_line->AppendSwitch(switches::kValidateInputEventStream);
453 452
454 browser_context_.reset(new TestBrowserContext()); 453 browser_context_.reset(new TestBrowserContext());
455 delegate_.reset(new MockRenderWidgetHostDelegate()); 454 delegate_.reset(new MockRenderWidgetHostDelegate());
456 process_ = new RenderWidgetHostProcess(browser_context_.get()); 455 process_ = new RenderWidgetHostProcess(browser_context_.get());
457 #if defined(USE_AURA) || (defined(OS_MACOSX) && !defined(OS_IOS)) 456 #if defined(USE_AURA) || (defined(OS_MACOSX) && !defined(OS_IOS))
458 if (IsDelegatedRendererEnabled()) { 457 if (IsDelegatedRendererEnabled()) {
459 ImageTransportFactory::InitializeForUnitTests( 458 ImageTransportFactory::InitializeForUnitTests(
460 scoped_ptr<ui::ContextFactory>(new ui::InProcessContextFactory)); 459 scoped_ptr<ImageTransportFactory>(
460 new NoTransportImageTransportFactory));
461 } 461 }
462 #endif 462 #endif
463 #if defined(USE_AURA) 463 #if defined(USE_AURA)
464 aura::Env::CreateInstance(true); 464 aura::Env::CreateInstance(true);
465 screen_.reset(aura::TestScreen::Create(gfx::Size())); 465 screen_.reset(aura::TestScreen::Create(gfx::Size()));
466 gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, screen_.get()); 466 gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, screen_.get());
467 #endif 467 #endif
468 host_.reset( 468 host_.reset(
469 new MockRenderWidgetHost(delegate_.get(), process_, MSG_ROUTING_NONE)); 469 new MockRenderWidgetHost(delegate_.get(), process_, MSG_ROUTING_NONE));
470 view_.reset(new TestView(host_.get())); 470 view_.reset(new TestView(host_.get()));
(...skipping 950 matching lines...) Expand 10 before | Expand all | Expand 10 after
1421 1421
1422 // Tests RWHI::ForwardTouchEventWithLatencyInfo(). 1422 // Tests RWHI::ForwardTouchEventWithLatencyInfo().
1423 PressTouchPoint(0, 1); 1423 PressTouchPoint(0, 1);
1424 SendTouchEvent(); 1424 SendTouchEvent();
1425 CheckLatencyInfoComponentInMessage( 1425 CheckLatencyInfoComponentInMessage(
1426 process_, GetLatencyComponentId(), WebInputEvent::TouchStart); 1426 process_, GetLatencyComponentId(), WebInputEvent::TouchStart);
1427 SendInputEventACK(WebInputEvent::TouchStart, INPUT_EVENT_ACK_STATE_CONSUMED); 1427 SendInputEventACK(WebInputEvent::TouchStart, INPUT_EVENT_ACK_STATE_CONSUMED);
1428 } 1428 }
1429 1429
1430 } // namespace content 1430 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698