Remove PendingCreateICRequest.

ui/base/ime/input_method_ibus_unittest.cc

 // Copyright (c) 2012 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 <cstring>
 
 #include "base/i18n/char_iterator.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/utf_string_conversions.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/ibus/ibus_text.h"
 #include "chromeos/dbus/ibus/mock_ibus_client.h"
 #include "chromeos/dbus/ibus/mock_ibus_input_context_client.h"
 #include "chromeos/dbus/mock_dbus_thread_manager_without_gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/ime/input_method_delegate.h"
 #include "ui/base/ime/input_method_ibus.h"
 #include "ui/base/ime/text_input_client.h"
 #include "ui/gfx/rect.h"
 
 namespace ui {
 namespace {
+const int kCreateInputContextMaxTrialCount = 10;
 
 uint32 GetOffsetInUTF16(const std::string& utf8_string, uint32 utf8_offset) {
   string16 utf16_string = UTF8ToUTF16(utf8_string);
   DCHECK_LT(utf8_offset, utf16_string.size());
   base::i18n::UTF16CharIterator char_iterator(&utf16_string);
   for (size_t i = 0; i < utf8_offset; ++i)
     char_iterator.Advance();
   return char_iterator.array_pos();
 }
 
@@ skipping 384 matching lines @@
 // it fails (unless ibus sends the "connected" signal to Chrome again). It might
 // be better to add some retry logic. Will revisit later.
 TEST_F(InputMethodIBusTest, CreateContextFail) {
   CreateInputContextFailHandler create_input_context_handler;
   mock_ibus_client_->set_create_input_context_handler(base::Bind(
       &CreateInputContextFailHandler::Run,
       base::Unretained(&create_input_context_handler)));
 
   chromeos::DBusThreadManager::Get()->InitIBusBus("dummy address");
   ime_->Init(true);
-  EXPECT_EQ(1, mock_ibus_client_->create_input_context_call_count());
+  // InputMethodIBus tries several times if the CreateInputContext method call
+  // is failed.
+  EXPECT_EQ(kCreateInputContextMaxTrialCount + 1,
+            mock_ibus_client_->create_input_context_call_count());
   // |set_capabilities_call_count()| should be zero since a context is not
   // created yet.
   EXPECT_EQ(0, mock_ibus_input_context_client_->set_capabilities_call_count());
 }
 
 // Confirm that ui::InputMethodIBus does not crash even if ibus-daemon does not
 // respond.
 TEST_F(InputMethodIBusTest, CreateContextNoResp) {
   CreateInputContextNoResponseHandler create_input_context_handler;
   mock_ibus_client_->set_create_input_context_handler(base::Bind(
@@ skipping 333 matching lines @@
             composition_text.underlines[0].start_offset);
   EXPECT_EQ(GetOffsetInUTF16(kSampleText, selection.end_index),
             composition_text.underlines[0].end_offset);
   EXPECT_EQ(SK_ColorBLACK, composition_text.underlines[0].color);
   EXPECT_TRUE(composition_text.underlines[0].thick);
 }
 
 // TODO(nona): Write more tests, especially for key event functions.
 
 }  // namespace ui