Index: content/browser/frame_host/render_frame_host_manager_unittest.cc |
diff --git a/content/browser/frame_host/render_frame_host_manager_unittest.cc b/content/browser/frame_host/render_frame_host_manager_unittest.cc |
index cf1545a5a2d00cce455eb538d7369b02f3480e9a..d3da015a08e89e89b7b8955e74aa3a44a2fce264 100644 |
--- a/content/browser/frame_host/render_frame_host_manager_unittest.cc |
+++ b/content/browser/frame_host/render_frame_host_manager_unittest.cc |
@@ -7,6 +7,7 @@ |
#include "base/strings/utf_string_conversions.h" |
#include "base/test/histogram_tester.h" |
#include "base/time/time.h" |
+#include "content/browser/compositor/test/no_transport_image_transport_factory.h" |
#include "content/browser/frame_host/cross_site_transferring_request.h" |
#include "content/browser/frame_host/navigation_controller_impl.h" |
#include "content/browser/frame_host/navigation_entry_impl.h" |
@@ -270,6 +271,11 @@ class RenderFrameHostManagerTest : public RenderViewHostImplTestHarness { |
void SetUp() override { |
RenderViewHostImplTestHarness::SetUp(); |
WebUIControllerFactory::RegisterFactory(&factory_); |
+#if !defined(OS_ANDROID) |
+ ImageTransportFactory::InitializeForUnitTests( |
+ scoped_ptr<ImageTransportFactory>( |
dcheng
2015/05/28 22:16:30
make_scoped_ptr will save you some typing.
kenrb
2015/05/29 19:29:36
Done.
|
+ new NoTransportImageTransportFactory)); |
+#endif |
} |
void TearDown() override { |