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

Unified Diff: blimp/client/core/compositor/blimp_compositor_manager_unittest.cc

Issue 2325893002: [blimp] Add support for having multiple tabs (Closed)
Patch Set: Add tablet and non-blimp support Created 4 years, 3 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: blimp/client/core/compositor/blimp_compositor_manager_unittest.cc
diff --git a/blimp/client/core/compositor/blimp_compositor_manager_unittest.cc b/blimp/client/core/compositor/blimp_compositor_manager_unittest.cc
index cd8b63fb9e252dfe6796bf4ba1e930410c0a3f8d..5a054720a11769c4cfd4e70d3edb8f4c2b7c3619 100644
--- a/blimp/client/core/compositor/blimp_compositor_manager_unittest.cc
+++ b/blimp/client/core/compositor/blimp_compositor_manager_unittest.cc
@@ -22,6 +22,8 @@ namespace blimp {
namespace client {
namespace {
+const int kDummyBlimpContentsId = 0;
+
class MockRenderWidgetFeature : public RenderWidgetFeature {
public:
MOCK_METHOD3(SendCompositorMessage,
@@ -54,10 +56,12 @@ class MockBlimpCompositor : public BlimpCompositor {
class BlimpCompositorManagerForTesting : public BlimpCompositorManager {
public:
explicit BlimpCompositorManagerForTesting(
+ int blimp_contents_id,
RenderWidgetFeature* render_widget_feature,
BlimpCompositorDependencies* compositor_dependencies)
- : BlimpCompositorManager(render_widget_feature, compositor_dependencies) {
- }
+ : BlimpCompositorManager(blimp_contents_id,
+ render_widget_feature,
+ compositor_dependencies) {}
using BlimpCompositorManager::GetCompositor;
@@ -80,7 +84,8 @@ class BlimpCompositorManagerTest : public testing::Test {
base::MakeUnique<MockCompositorDependencies>());
compositor_manager_ = base::MakeUnique<BlimpCompositorManagerForTesting>(
- &render_widget_feature_, compositor_dependencies_.get());
+ kDummyBlimpContentsId, &render_widget_feature_,
+ compositor_dependencies_.get());
}
void TearDown() override {
« no previous file with comments | « blimp/client/core/compositor/blimp_compositor_manager.cc ('k') | blimp/client/core/contents/blimp_contents_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698