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

Unified Diff: blimp/client/core/contents/blimp_contents_observer_unittest.cc

Issue 2292343002: Hooking up Blimp IME with BlimpContents (Closed)
Patch Set: Fixed linux client Created 4 years, 4 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/contents/blimp_contents_observer_unittest.cc
diff --git a/blimp/client/core/contents/blimp_contents_observer_unittest.cc b/blimp/client/core/contents/blimp_contents_observer_unittest.cc
index 527ffb268c9061d58ff1caedea65a63f410512b6..6892abe7c113501ee38db67c21fb451ef677adb8 100644
--- a/blimp/client/core/contents/blimp_contents_observer_unittest.cc
+++ b/blimp/client/core/contents/blimp_contents_observer_unittest.cc
@@ -7,6 +7,7 @@
#include "base/memory/ptr_util.h"
#include "blimp/client/core/compositor/blimp_compositor_dependencies.h"
#include "blimp/client/core/contents/blimp_contents_impl.h"
+#include "blimp/client/core/contents/ime_feature.h"
#include "blimp/client/core/render_widget/render_widget_feature.h"
#include "blimp/client/support/compositor/mock_compositor_dependencies.h"
#include "testing/gmock/include/gmock/gmock.h"
@@ -55,11 +56,13 @@ class BlimpContentsObserverTest : public testing::Test {
};
TEST_F(BlimpContentsObserverTest, ObserverDies) {
+ ImeFeature ime_feature;
RenderWidgetFeature render_widget_feature;
BlimpCompositorDependencies compositor_deps(
base::MakeUnique<MockCompositorDependencies>());
- BlimpContentsImpl contents(kDummyTabId, window_, &compositor_deps, nullptr,
- nullptr, &render_widget_feature, nullptr);
+ BlimpContentsImpl contents(kDummyTabId, window_, &compositor_deps,
+ &ime_feature, nullptr, &render_widget_feature,
+ nullptr);
std::unique_ptr<BlimpContentsObserver> observer =
base::MakeUnique<TestBlimpContentsObserver>(&contents);
@@ -72,13 +75,14 @@ TEST_F(BlimpContentsObserverTest, ObserverDies) {
TEST_F(BlimpContentsObserverTest, ContentsDies) {
std::unique_ptr<TestBlimpContentsObserver> observer;
+ ImeFeature ime_feature;
RenderWidgetFeature render_widget_feature;
BlimpCompositorDependencies compositor_deps(
base::MakeUnique<MockCompositorDependencies>());
std::unique_ptr<BlimpContentsImpl> contents =
- base::MakeUnique<BlimpContentsImpl>(kDummyTabId, window_,
- &compositor_deps, nullptr, nullptr,
- &render_widget_feature, nullptr);
+ base::MakeUnique<BlimpContentsImpl>(
+ kDummyTabId, window_, &compositor_deps, &ime_feature, nullptr,
+ &render_widget_feature, nullptr);
observer.reset(new TestBlimpContentsObserver(contents.get()));
EXPECT_CALL(*observer, OnContentsDestroyed()).Times(1);
EXPECT_EQ(observer->blimp_contents(), contents.get());
« no previous file with comments | « blimp/client/core/contents/blimp_contents_manager_unittest.cc ('k') | blimp/client/core/contents/blimp_contents_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698