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

Unified Diff: content/browser/compositor/reflector_impl_unittest.cc

Issue 2873243002: Move components/display_compositor to components/viz/display_compositor (Closed)
Patch Set: Rebase Created 3 years, 7 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
« no previous file with comments | « content/browser/compositor/owned_mailbox.cc ('k') | content/browser/compositor/reflector_texture.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/compositor/reflector_impl_unittest.cc
diff --git a/content/browser/compositor/reflector_impl_unittest.cc b/content/browser/compositor/reflector_impl_unittest.cc
index 868c2ff8f757f01744ac6ce11cd34dd92dcc440e..0fd98a42794cf2f3d57c2653b68cd5351e60ab28 100644
--- a/content/browser/compositor/reflector_impl_unittest.cc
+++ b/content/browser/compositor/reflector_impl_unittest.cc
@@ -15,7 +15,7 @@
#include "cc/scheduler/delay_based_time_source.h"
#include "cc/test/test_context_provider.h"
#include "cc/test/test_web_graphics_context_3d.h"
-#include "components/display_compositor/compositor_overlay_candidate_validator.h"
+#include "components/viz/display_compositor/compositor_overlay_candidate_validator.h"
#include "content/browser/compositor/browser_compositor_output_surface.h"
#include "content/browser/compositor/reflector_texture.h"
#include "content/browser/compositor/test/no_transport_image_transport_factory.h"
@@ -25,7 +25,7 @@
#include "ui/compositor/test/context_factories_for_test.h"
#if defined(USE_OZONE)
-#include "components/display_compositor/compositor_overlay_candidate_validator_ozone.h"
+#include "components/viz/display_compositor/compositor_overlay_candidate_validator_ozone.h"
#include "ui/ozone/public/overlay_candidates_ozone.h"
#endif // defined(USE_OZONE)
@@ -63,12 +63,11 @@ class TestOverlayCandidatesOzone : public ui::OverlayCandidatesOzone {
};
#endif // defined(USE_OZONE)
-std::unique_ptr<display_compositor::CompositorOverlayCandidateValidator>
+std::unique_ptr<viz::CompositorOverlayCandidateValidator>
CreateTestValidatorOzone() {
#if defined(USE_OZONE)
- return std::unique_ptr<
- display_compositor::CompositorOverlayCandidateValidator>(
- new display_compositor::CompositorOverlayCandidateValidatorOzone(
+ return std::unique_ptr<viz::CompositorOverlayCandidateValidator>(
+ new viz::CompositorOverlayCandidateValidatorOzone(
std::unique_ptr<ui::OverlayCandidatesOzone>(
new TestOverlayCandidatesOzone()),
""));
« no previous file with comments | « content/browser/compositor/owned_mailbox.cc ('k') | content/browser/compositor/reflector_texture.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698