Fix VK animation related issues

ui/base/ime/input_method_factory.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 "ui/base/ime/input_method_factory.h"
 
 #include "ui/base/ime/mock_input_method.h"
 
 #if defined(OS_CHROMEOS) && defined(USE_X11)
 #include "ui/base/ime/input_method_ibus.h"
@@ skipping 39 matching lines @@
   if (IsRemoteInputMethodWinRequired(widget))
     return CreateRemoteInputMethodWin(delegate);
   return scoped_ptr<InputMethod>(new InputMethodIMM32(delegate, widget));
 #elif defined(USE_AURA) && defined(OS_LINUX)
   return scoped_ptr<InputMethod>(new InputMethodAuraLinux(delegate));
 #else
   return scoped_ptr<InputMethod>(new InputMethodMinimal(delegate));
 #endif
 }
 
 void SetUpInputMethodFactoryForTesting() {

[bshe, 2014/01/13 22:12:25]

My tests suffer the same problem as described in: crbug.com/331690. This fix is
borrowed from
(https://codereview.chromium.org/29943002/diff/980001/ui/base/ime/input_method...)
to keep my tests pass.

+  if (g_input_method_set_for_testing)
+    return;
+
   CHECK(!g_create_input_method_called)
       << "ui::SetUpInputMethodFactoryForTesting was called after use of "
       << "ui::CreateInputMethod.  You must call "
       << "ui::SetUpInputMethodFactoryForTesting earlier.";
 
   g_input_method_set_for_testing = true;
 }
 
 #if defined(OS_WIN)
 InputMethod* GetSharedInputMethod() {
   if (!g_shared_input_method)
     g_shared_input_method = CreateInputMethod(NULL, NULL).release();
   return g_shared_input_method;
 }
 
 namespace internal {
 
 void DestroySharedInputMethod() {
   delete g_shared_input_method;
   g_shared_input_method = NULL;
 }
 
 }  // namespace internal
 #endif
 
 }  // namespace ui