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

Unified Diff: content/browser/frame_host/render_widget_host_view_child_frame_unittest.cc

Issue 2835403004: Revert "Use MojoCompositorFrameSink in RendererCompositorFrameSink"
Patch Set: Rebased Created 3 years, 8 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/frame_host/render_widget_host_view_child_frame_unittest.cc
diff --git a/content/browser/frame_host/render_widget_host_view_child_frame_unittest.cc b/content/browser/frame_host/render_widget_host_view_child_frame_unittest.cc
index f0934df2bd42391e8793c40793431e67328f7a32..86493be1cd720b372da46341b56a1885c189f6b6 100644
--- a/content/browser/frame_host/render_widget_host_view_child_frame_unittest.cc
+++ b/content/browser/frame_host/render_widget_host_view_child_frame_unittest.cc
@@ -30,7 +30,6 @@
#include "content/public/browser/render_widget_host_view.h"
#include "content/public/test/mock_render_process_host.h"
#include "content/public/test/test_browser_context.h"
-#include "content/test/fake_renderer_compositor_frame_sink.h"
#include "content/test/test_render_view_host.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/compositor/compositor.h"
@@ -94,17 +93,6 @@ class RenderWidgetHostViewChildFrameTest : public testing::Test {
test_frame_connector_ = new MockCrossProcessFrameConnector();
view_->SetCrossProcessFrameConnector(test_frame_connector_);
-
- cc::mojom::MojoCompositorFrameSinkPtr sink;
- cc::mojom::MojoCompositorFrameSinkRequest sink_request =
- mojo::MakeRequest(&sink);
- cc::mojom::MojoCompositorFrameSinkClientRequest client_request =
- mojo::MakeRequest(&renderer_compositor_frame_sink_ptr_);
- renderer_compositor_frame_sink_ =
- base::MakeUnique<FakeRendererCompositorFrameSink>(
- std::move(sink), std::move(client_request));
- view_->DidCreateNewRendererCompositorFrameSink(
- renderer_compositor_frame_sink_ptr_.get());
}
void TearDown() override {
@@ -149,13 +137,8 @@ class RenderWidgetHostViewChildFrameTest : public testing::Test {
RenderWidgetHostImpl* widget_host_;
RenderWidgetHostViewChildFrame* view_;
MockCrossProcessFrameConnector* test_frame_connector_;
- std::unique_ptr<FakeRendererCompositorFrameSink>
- renderer_compositor_frame_sink_;
private:
- cc::mojom::MojoCompositorFrameSinkClientPtr
- renderer_compositor_frame_sink_ptr_;
-
DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewChildFrameTest);
};

Powered by Google App Engine
This is Rietveld 408576698