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

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

Issue 2554583002: Get rid of ImageTransportFactory::GetSurfaceManager (Closed)
Patch Set: Add missing include Created 4 years 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_guest_unittest.cc
diff --git a/content/browser/frame_host/render_widget_host_view_guest_unittest.cc b/content/browser/frame_host/render_widget_host_view_guest_unittest.cc
index 737f652f551186c291f3c1f4f131b30f8304cd1b..a9aada056c9b6ffc432c2d7eef6acd7c8fce343a 100644
--- a/content/browser/frame_host/render_widget_host_view_guest_unittest.cc
+++ b/content/browser/frame_host/render_widget_host_view_guest_unittest.cc
@@ -29,6 +29,7 @@
#include "content/test/test_render_view_host.h"
#include "content/test/test_web_contents.h"
#include "testing/gtest/include/gtest/gtest.h"
+#include "ui/compositor/compositor.h"
#if defined(OS_ANDROID)
#include "content/browser/renderer_host/context_provider_factory_impl_android.h"
@@ -275,7 +276,8 @@ TEST_F(RenderWidgetHostViewGuestSurfaceTest, TestGuestSurface) {
if (id.is_valid()) {
#if !defined(OS_ANDROID)
ImageTransportFactory* factory = ImageTransportFactory::GetInstance();
- cc::SurfaceManager* manager = factory->GetSurfaceManager();
+ cc::SurfaceManager* manager =
+ factory->GetContextFactory()->GetSurfaceManager();
cc::Surface* surface = manager->GetSurfaceForId(id);
EXPECT_TRUE(surface);
// There should be a SurfaceSequence created by the RWHVGuest.
@@ -298,7 +300,8 @@ TEST_F(RenderWidgetHostViewGuestSurfaceTest, TestGuestSurface) {
if (id.is_valid()) {
#if !defined(OS_ANDROID)
ImageTransportFactory* factory = ImageTransportFactory::GetInstance();
- cc::SurfaceManager* manager = factory->GetSurfaceManager();
+ cc::SurfaceManager* manager =
+ factory->GetContextFactory()->GetSurfaceManager();
cc::Surface* surface = manager->GetSurfaceForId(id);
EXPECT_TRUE(surface);
// There should be a SurfaceSequence created by the RWHVGuest.

Powered by Google App Engine
This is Rietveld 408576698