| Index: content/renderer/render_view_browsertest.cc
|
| diff --git a/content/renderer/render_view_browsertest.cc b/content/renderer/render_view_browsertest.cc
|
| index 7c1715e9e80eb603b309bdd4a38bf577793c37f9..3fbf1d9d1883e7246c5a5178043556cb3d799222 100644
|
| --- a/content/renderer/render_view_browsertest.cc
|
| +++ b/content/renderer/render_view_browsertest.cc
|
| @@ -34,6 +34,7 @@
|
| #include "third_party/WebKit/public/web/WebDataSource.h"
|
| #include "third_party/WebKit/public/web/WebFrame.h"
|
| #include "third_party/WebKit/public/web/WebHistoryItem.h"
|
| +#include "third_party/WebKit/public/web/WebRuntimeFeatures.h"
|
| #include "third_party/WebKit/public/web/WebView.h"
|
| #include "third_party/WebKit/public/web/WebWindowFeatures.h"
|
| #include "ui/base/keycodes/keyboard_codes.h"
|
| @@ -58,6 +59,7 @@
|
| using WebKit::WebFrame;
|
| using WebKit::WebInputEvent;
|
| using WebKit::WebMouseEvent;
|
| +using WebKit::WebRuntimeFeatures;
|
| using WebKit::WebString;
|
| using WebKit::WebTextDirection;
|
| using WebKit::WebURLError;
|
| @@ -119,6 +121,17 @@ class RenderViewImplTest : public RenderViewTest {
|
| mock_keyboard_.reset(new MockKeyboard());
|
| }
|
|
|
| + virtual ~RenderViewImplTest() {}
|
| +
|
| + virtual void SetUp() OVERRIDE {
|
| + RenderViewTest::SetUp();
|
| + // This test depends on Blink flag InputModeAttribute, which is enabled
|
| + // under only test. Content browser test doesn't enable the feature so we
|
| + // need enable it manually.
|
| + // TODO(yoichio): Remove this if InputMode feature is enabled by default.
|
| + WebRuntimeFeatures::enableInputModeAttribute(true);
|
| + }
|
| +
|
| RenderViewImpl* view() {
|
| return static_cast<RenderViewImpl*>(view_);
|
| }
|
| @@ -771,10 +784,7 @@ TEST_F(RenderViewImplTest, DontIgnoreBackAfterNavEntryLimit) {
|
|
|
| // Test that our IME backend sends a notification message when the input focus
|
| // changes.
|
| -// crbug.com/276821:
|
| -// Because Blink change cause this test failed, we first disabled this test and
|
| -// fix later.
|
| -TEST_F(RenderViewImplTest, DISABLED_OnImeTypeChanged) {
|
| +TEST_F(RenderViewImplTest, OnImeTypeChanged) {
|
| // Enable our IME backend code.
|
| view()->OnSetInputMethodActive(true);
|
|
|
|
|