| Index: ui/views/cocoa/bridged_native_widget_unittest.mm
|
| diff --git a/ui/views/cocoa/bridged_native_widget_unittest.mm b/ui/views/cocoa/bridged_native_widget_unittest.mm
|
| index af08bf0147505030095fa58bd15b9e3832adc67e..479203e69a5421fd8da4a077b778e6245ec9976b 100644
|
| --- a/ui/views/cocoa/bridged_native_widget_unittest.mm
|
| +++ b/ui/views/cocoa/bridged_native_widget_unittest.mm
|
| @@ -14,12 +14,12 @@
|
| #include "base/strings/sys_string_conversions.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| #import "testing/gtest_mac.h"
|
| +#include "ui/base/ime/input_method.h"
|
| #import "ui/gfx/test/ui_cocoa_test_helper.h"
|
| #import "ui/views/cocoa/bridged_content_view.h"
|
| #import "ui/views/cocoa/native_widget_mac_nswindow.h"
|
| #import "ui/views/cocoa/views_nswindow_delegate.h"
|
| #include "ui/views/controls/textfield/textfield.h"
|
| -#include "ui/views/ime/input_method.h"
|
| #include "ui/views/view.h"
|
| #include "ui/views/widget/native_widget_mac.h"
|
| #include "ui/views/widget/root_view.h"
|
| @@ -268,13 +268,8 @@ TEST_F(BridgedNativeWidgetTest, ViewSizeTracksWindow) {
|
| EXPECT_EQ(kTestNewHeight, view_->height());
|
| }
|
|
|
| -TEST_F(BridgedNativeWidgetTest, CreateInputMethodShouldNotReturnNull) {
|
| - scoped_ptr<views::InputMethod> input_method(bridge()->CreateInputMethod());
|
| - EXPECT_TRUE(input_method);
|
| -}
|
| -
|
| -TEST_F(BridgedNativeWidgetTest, GetHostInputMethodShouldNotReturnNull) {
|
| - EXPECT_TRUE(bridge()->GetHostInputMethod());
|
| +TEST_F(BridgedNativeWidgetTest, GetInputMethodShouldNotReturnNull) {
|
| + EXPECT_TRUE(bridge()->GetInputMethod());
|
| }
|
|
|
| // A simpler test harness for testing initialization flows.
|
|
|