Adding MimeHandlerView.

chrome/browser/apps/web_view_interactive_browsertest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/apps/app_browsertest_util.h"
 #include "chrome/browser/chrome_content_browser_client.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
@@ skipping 992 matching lines @@
       embedder_web_contents->GetRenderViewHost()->GetView()
           ->GetTextInputClient();
   ASSERT_TRUE(text_input_client);
   ASSERT_TRUE(text_input_client->GetTextInputType() !=
               ui::TEXT_INPUT_TYPE_NONE);
 #endif
 }
 
 // ui::TextInputClient is NULL for mac and android.
 #if !defined(OS_MACOSX) && !defined(OS_ANDROID)
-IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest, DISABLED_Focus_InputMethod) {
+IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest, Focus_InputMethod) {
   content::WebContents* embedder_web_contents = NULL;
   scoped_ptr<ExtensionTestMessageListener> done_listener(
       RunAppHelper("testInputMethod", "web_view/focus", NO_TEST_SERVER,
                    &embedder_web_contents));
   ASSERT_TRUE(done_listener->WaitUntilSatisfied());
 
   ui::TextInputClient* text_input_client =
       embedder_web_contents->GetRenderViewHost()->GetView()
           ->GetTextInputClient();
   ASSERT_TRUE(text_input_client);
@@ skipping 31 matching lines @@
     EXPECT_TRUE(next_step_listener.WaitUntilSatisfied());
   }
 
   // Moving focus causes IME cancel, and the composition will be committed
   // in first <input> in the <webview>, not in the second <input>.
   {
     next_step_listener.Reset();
     ui::CompositionText composition;
     composition.text = base::UTF8ToUTF16("InputTest789");
     text_input_client->SetCompositionText(composition);
+    // Do a roundtrip to the renderer so that in-flight IPC from
+    // SetCompositionText() above gets routed before the next step.
+    // The test becomes flaky otherwise.
+    EXPECT_TRUE(content::ExecuteScript(embedder_web_contents, std::string()));
     EXPECT_TRUE(content::ExecuteScript(
                     embedder_web_contents,
                     "window.runCommand('testInputMethodRunNextStep', 3);"));
 
     // Wait for the next step to complete.
     EXPECT_TRUE(next_step_listener.WaitUntilSatisfied());
   }
 
   // Tests ExtendSelectionAndDelete message works in <webview>.
   {
@@ skipping 31 matching lines @@
 
   // Now verify that the selection text propagates properly to RWHV.
   content::RenderWidgetHostView* guest_rwhv =
       guest_web_contents()->GetRenderWidgetHostView();
   ASSERT_TRUE(guest_rwhv);
   std::string selected_text = base::UTF16ToUTF8(guest_rwhv->GetSelectedText());
   ASSERT_TRUE(selected_text.size() >= 10u);
   ASSERT_EQ("AAAAAAAAAA", selected_text.substr(0, 10));
 }
 #endif