| Index: ui/views/controls/combobox/combobox_unittest.cc
|
| diff --git a/ui/views/controls/combobox/combobox_unittest.cc b/ui/views/controls/combobox/combobox_unittest.cc
|
| index c2f6085dd3272c0f54c0f3f27350970d137e6a81..364c5844f39a9ce55bd08decf6da7b21d5ca36eb 100644
|
| --- a/ui/views/controls/combobox/combobox_unittest.cc
|
| +++ b/ui/views/controls/combobox/combobox_unittest.cc
|
| @@ -212,6 +212,9 @@ class ComboboxTest : public ViewsTestBase {
|
| CreateParams(Widget::InitParams::TYPE_WINDOW_FRAMELESS);
|
| params.bounds = gfx::Rect(200, 200, 200, 200);
|
| widget_->Init(params);
|
| + // This test sends events that in mus are normally routed to ime. Disable
|
| + // talking to the server so the test doesn't have to wait for the ack.
|
| + DisableMusInputMethod(widget_);
|
| View* container = new View();
|
| widget_->SetContentsView(container);
|
| container->AddChildView(combobox_);
|
|
|