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

Side by Side Diff: content/browser/frame_host/render_widget_host_view_guest_unittest.cc

Issue 2190033002: content: Add ContextProviderFactory to create a render ContextProvider. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove display_ DCHECK. Created 4 years, 4 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/browser/frame_host/render_widget_host_view_guest.h" 5 #include "content/browser/frame_host/render_widget_host_view_guest.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 12 matching lines...) Expand all
23 #include "content/browser/renderer_host/render_widget_host_impl.h" 23 #include "content/browser/renderer_host/render_widget_host_impl.h"
24 #include "content/common/view_messages.h" 24 #include "content/common/view_messages.h"
25 #include "content/public/browser/browser_plugin_guest_delegate.h" 25 #include "content/public/browser/browser_plugin_guest_delegate.h"
26 #include "content/public/browser/render_widget_host_view.h" 26 #include "content/public/browser/render_widget_host_view.h"
27 #include "content/public/test/mock_render_process_host.h" 27 #include "content/public/test/mock_render_process_host.h"
28 #include "content/public/test/test_browser_context.h" 28 #include "content/public/test/test_browser_context.h"
29 #include "content/test/test_render_view_host.h" 29 #include "content/test/test_render_view_host.h"
30 #include "content/test/test_web_contents.h" 30 #include "content/test/test_web_contents.h"
31 #include "testing/gtest/include/gtest/gtest.h" 31 #include "testing/gtest/include/gtest/gtest.h"
32 32
33 #if defined(OS_ANDROID)
34 #include "content/browser/renderer_host/context_provider_factory_impl_android.h"
35 #endif
36
33 namespace content { 37 namespace content {
34 namespace { 38 namespace {
35 class MockRenderWidgetHostDelegate : public RenderWidgetHostDelegate { 39 class MockRenderWidgetHostDelegate : public RenderWidgetHostDelegate {
36 public: 40 public:
37 MockRenderWidgetHostDelegate() {} 41 MockRenderWidgetHostDelegate() {}
38 ~MockRenderWidgetHostDelegate() override {} 42 ~MockRenderWidgetHostDelegate() override {}
39 43
40 private: 44 private:
41 // RenderWidgetHostDelegate: 45 // RenderWidgetHostDelegate:
42 void Cut() override {} 46 void Cut() override {}
43 void Copy() override {} 47 void Copy() override {}
44 void Paste() override {} 48 void Paste() override {}
45 void SelectAll() override {} 49 void SelectAll() override {}
46 }; 50 };
47 51
48 class RenderWidgetHostViewGuestTest : public testing::Test { 52 class RenderWidgetHostViewGuestTest : public testing::Test {
49 public: 53 public:
50 RenderWidgetHostViewGuestTest() {} 54 RenderWidgetHostViewGuestTest() {}
51 55
52 void SetUp() override { 56 void SetUp() override {
53 #if !defined(OS_ANDROID) 57 #if !defined(OS_ANDROID)
54 ImageTransportFactory::InitializeForUnitTests( 58 ImageTransportFactory::InitializeForUnitTests(
55 std::unique_ptr<ImageTransportFactory>( 59 std::unique_ptr<ImageTransportFactory>(
56 new NoTransportImageTransportFactory)); 60 new NoTransportImageTransportFactory));
61 #else
62 ui::ContextProviderFactory::SetInstance(
63 ContextProviderFactoryImpl::GetInstance());
57 #endif 64 #endif
58 browser_context_.reset(new TestBrowserContext); 65 browser_context_.reset(new TestBrowserContext);
59 MockRenderProcessHost* process_host = 66 MockRenderProcessHost* process_host =
60 new MockRenderProcessHost(browser_context_.get()); 67 new MockRenderProcessHost(browser_context_.get());
61 int32_t routing_id = process_host->GetNextRoutingID(); 68 int32_t routing_id = process_host->GetNextRoutingID();
62 widget_host_ = 69 widget_host_ =
63 new RenderWidgetHostImpl(&delegate_, process_host, routing_id, false); 70 new RenderWidgetHostImpl(&delegate_, process_host, routing_id, false);
64 view_ = new RenderWidgetHostViewGuest( 71 view_ = new RenderWidgetHostViewGuest(
65 widget_host_, NULL, 72 widget_host_, NULL,
66 (new TestRenderWidgetHostView(widget_host_))->GetWeakPtr()); 73 (new TestRenderWidgetHostView(widget_host_))->GetWeakPtr());
67 } 74 }
68 75
69 void TearDown() override { 76 void TearDown() override {
70 if (view_) 77 if (view_)
71 view_->Destroy(); 78 view_->Destroy();
72 delete widget_host_; 79 delete widget_host_;
73 80
74 browser_context_.reset(); 81 browser_context_.reset();
75 82
76 message_loop_.task_runner()->DeleteSoon(FROM_HERE, 83 message_loop_.task_runner()->DeleteSoon(FROM_HERE,
77 browser_context_.release()); 84 browser_context_.release());
78 message_loop_.RunUntilIdle(); 85 message_loop_.RunUntilIdle();
79 #if !defined(OS_ANDROID) 86 #if !defined(OS_ANDROID)
80 ImageTransportFactory::Terminate(); 87 ImageTransportFactory::Terminate();
88 #else
89 ui::ContextProviderFactory::SetInstance(nullptr);
81 #endif 90 #endif
82 } 91 }
83 92
84 protected: 93 protected:
85 base::MessageLoopForUI message_loop_; 94 base::MessageLoopForUI message_loop_;
86 std::unique_ptr<BrowserContext> browser_context_; 95 std::unique_ptr<BrowserContext> browser_context_;
87 MockRenderWidgetHostDelegate delegate_; 96 MockRenderWidgetHostDelegate delegate_;
88 97
89 // Tests should set these to NULL if they've already triggered their 98 // Tests should set these to NULL if they've already triggered their
90 // destruction. 99 // destruction.
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
284 293
285 browser_plugin_guest_->set_attached(false); 294 browser_plugin_guest_->set_attached(false);
286 browser_plugin_guest_->ResetTestData(); 295 browser_plugin_guest_->ResetTestData();
287 296
288 view_->OnSwapCompositorFrame( 297 view_->OnSwapCompositorFrame(
289 0, CreateDelegatedFrame(scale_factor, view_size, view_rect)); 298 0, CreateDelegatedFrame(scale_factor, view_size, view_rect));
290 EXPECT_TRUE(surface_id().is_null()); 299 EXPECT_TRUE(surface_id().is_null());
291 } 300 }
292 301
293 } // namespace content 302 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/frame_host/render_widget_host_view_child_frame_unittest.cc ('k') | content/browser/gpu/gpu_surface_tracker.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698