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

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

Issue 2079623002: Create only one ContextFactory in content unit tests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add dcheck Created 4 years, 6 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_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 bf9960b8bf1af62602d163184570760aaa753085..61e675568910bd07b9340a77cf43f6c53fc62ea9 100644
--- a/content/browser/frame_host/render_frame_host_manager_unittest.cc
+++ b/content/browser/frame_host/render_frame_host_manager_unittest.cc
@@ -17,7 +17,6 @@
#include "base/test/histogram_tester.h"
#include "base/time/time.h"
#include "build/build_config.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"
@@ -306,20 +305,11 @@ class RenderFrameHostManagerTest : public RenderViewHostImplTestHarness {
void SetUp() override {
RenderViewHostImplTestHarness::SetUp();
WebUIControllerFactory::RegisterFactory(&factory_);
-#if !defined(OS_ANDROID)
- ImageTransportFactory::InitializeForUnitTests(
- base::WrapUnique(new NoTransportImageTransportFactory));
-#endif
}
void TearDown() override {
RenderViewHostImplTestHarness::TearDown();
WebUIControllerFactory::UnregisterFactoryForTesting(&factory_);
-#if !defined(OS_ANDROID)
- // RenderWidgetHostView holds on to a reference to SurfaceManager, so it
- // must be shut down before the ImageTransportFactory.
- ImageTransportFactory::Terminate();
-#endif
}
void set_should_create_webui(bool should_create_webui) {

Powered by Google App Engine
This is Rietveld 408576698